This is an automated email from the ASF dual-hosted git repository. kxiao pushed a commit to branch branch-2.0 in repository https://gitbox.apache.org/repos/asf/doris.git
commit 7814f062906334eb3b7c7d4ea77b65ca021a4b3e Author: airborne12 <[email protected]> AuthorDate: Thu Jul 6 13:09:37 2023 +0800 [Fix](ScannerScheduler) fix dead lock when shutdown group_local_scan_thread_pool (#21553) --- be/src/vec/exec/scan/scanner_scheduler.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/be/src/vec/exec/scan/scanner_scheduler.cpp b/be/src/vec/exec/scan/scanner_scheduler.cpp index 91bed3ee2e..b89c11826d 100644 --- a/be/src/vec/exec/scan/scanner_scheduler.cpp +++ b/be/src/vec/exec/scan/scanner_scheduler.cpp @@ -63,6 +63,7 @@ ScannerScheduler::~ScannerScheduler() { _is_closed = true; + _task_group_local_scan_queue->close(); _scheduler_pool->shutdown(); _local_scan_thread_pool->shutdown(); _remote_scan_thread_pool->shutdown(); @@ -70,6 +71,9 @@ ScannerScheduler::~ScannerScheduler() { _scheduler_pool->wait(); _local_scan_thread_pool->join(); + _remote_scan_thread_pool->wait(); + _limited_scan_thread_pool->wait(); + _group_local_scan_thread_pool->wait(); for (int i = 0; i < QUEUE_NUM; i++) { delete _pending_queues[i]; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
