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
The following commit(s) were added to refs/heads/branch-2.0 by this push:
new 8b40a5ef12 Revert "[Fix](ScannerScheduler) fix dead lock when shutdown
group_local_scan_thread_pool (#21553)"
8b40a5ef12 is described below
commit 8b40a5ef12bed365fb78ffc4489fae6fc9ebf3ce
Author: Kang <[email protected]>
AuthorDate: Fri Jul 7 17:10:04 2023 +0800
Revert "[Fix](ScannerScheduler) fix dead lock when shutdown
group_local_scan_thread_pool (#21553)"
This reverts commit 7814f062906334eb3b7c7d4ea77b65ca021a4b3e.
---
be/src/vec/exec/scan/scanner_scheduler.cpp | 4 ----
1 file changed, 4 deletions(-)
diff --git a/be/src/vec/exec/scan/scanner_scheduler.cpp
b/be/src/vec/exec/scan/scanner_scheduler.cpp
index b89c11826d..91bed3ee2e 100644
--- a/be/src/vec/exec/scan/scanner_scheduler.cpp
+++ b/be/src/vec/exec/scan/scanner_scheduler.cpp
@@ -63,7 +63,6 @@ ScannerScheduler::~ScannerScheduler() {
_is_closed = true;
- _task_group_local_scan_queue->close();
_scheduler_pool->shutdown();
_local_scan_thread_pool->shutdown();
_remote_scan_thread_pool->shutdown();
@@ -71,9 +70,6 @@ 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]
