This is an automated email from the ASF dual-hosted git repository.
gabriellee pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-3.0 by this push:
new 7af87cc80e2 branch-3.0: [refactor](cancel) Reduce lock scope in cancel
worker #42520 (#44837)
7af87cc80e2 is described below
commit 7af87cc80e2a8eee3a2e8b8370ec73b758b9c9b2
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Mon Dec 2 13:47:00 2024 +0800
branch-3.0: [refactor](cancel) Reduce lock scope in cancel worker #42520
(#44837)
Cherry-picked from #42520
Co-authored-by: Gabriel <[email protected]>
---
be/src/runtime/fragment_mgr.cpp | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/be/src/runtime/fragment_mgr.cpp b/be/src/runtime/fragment_mgr.cpp
index 65e45f81f38..337a7aa41fc 100644
--- a/be/src/runtime/fragment_mgr.cpp
+++ b/be/src/runtime/fragment_mgr.cpp
@@ -935,11 +935,20 @@ void FragmentMgr::cancel_worker() {
running_queries_on_all_fes.clear();
}
+ std::vector<std::shared_ptr<pipeline::PipelineFragmentContext>> ctx;
{
std::lock_guard<std::mutex> lock(_lock);
+ ctx.reserve(_pipeline_map.size());
for (auto& pipeline_itr : _pipeline_map) {
- pipeline_itr.second->clear_finished_tasks();
+ ctx.push_back(pipeline_itr.second);
}
+ }
+ for (auto& c : ctx) {
+ c->clear_finished_tasks();
+ }
+
+ {
+ std::lock_guard<std::mutex> lock(_lock);
for (auto it = _query_ctx_map.begin(); it !=
_query_ctx_map.end();) {
if (auto q_ctx = it->second.lock()) {
if (q_ctx->is_timeout(now)) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
