yiguolei commented on code in PR #44821:
URL: https://github.com/apache/doris/pull/44821#discussion_r1864772918
##########
be/src/runtime/fragment_mgr.cpp:
##########
@@ -602,37 +601,45 @@ Status FragmentMgr::start_query_execution(const
PExecPlanFragmentStartRequest* r
void FragmentMgr::remove_pipeline_context(
std::shared_ptr<pipeline::PipelineFragmentContext> f_context) {
- {
- std::lock_guard<std::mutex> lock(_lock);
- auto query_id = f_context->get_query_id();
- int64 now = duration_cast<std::chrono::milliseconds>(
-
std::chrono::system_clock::now().time_since_epoch())
- .count();
- g_fragment_executing_count << -1;
- g_fragment_last_active_time.set_value(now);
- _pipeline_map.erase({query_id, f_context->get_fragment_id()});
- }
+ auto query_id = f_context->get_query_id();
+ int64 now = duration_cast<std::chrono::milliseconds>(
+ std::chrono::system_clock::now().time_since_epoch())
+ .count();
+ g_fragment_executing_count << -1;
+ g_fragment_last_active_time.set_value(now);
+
+ std::unique_lock lock(_pipeline_map_mutex);
+ _pipeline_map.erase({query_id, f_context->get_fragment_id()});
}
-std::shared_ptr<QueryContext> FragmentMgr::_get_or_erase_query_ctx(const
TUniqueId& query_id) {
+std::shared_ptr<QueryContext> FragmentMgr::get_query_ctx(const TUniqueId&
query_id) {
+ std::shared_lock lock(_query_ctx_map_mutex);
auto search = _query_ctx_map.find(query_id);
if (search != _query_ctx_map.end()) {
if (auto q_ctx = search->second.lock()) {
return q_ctx;
- } else {
- LOG(WARNING) << "Query context (query id = " << print_id(query_id)
- << ") has been released.";
- _query_ctx_map.erase(search);
- return nullptr;
}
}
return nullptr;
}
-std::shared_ptr<QueryContext> FragmentMgr::get_or_erase_query_ctx_with_lock(
- const TUniqueId& query_id) {
- std::unique_lock<std::mutex> lock(_lock);
- return _get_or_erase_query_ctx(query_id);
+std::pair<Status, std::shared_ptr<QueryContext>>
FragmentMgr::_get_or_insert_query_ctx(
Review Comment:
return Result
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
