This is an automated email from the ASF dual-hosted git repository.
gabriellee pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 230b876f5bd [bugfix](scannerdeadloop) there is a dead loop in scanner
ctx (#29794)
230b876f5bd is described below
commit 230b876f5bd61d4d9bccb03824811a88460d34ac
Author: yiguolei <[email protected]>
AuthorDate: Wed Jan 10 21:48:23 2024 +0800
[bugfix](scannerdeadloop) there is a dead loop in scanner ctx (#29794)
Co-authored-by: yiguolei <[email protected]>
---
be/src/vec/exec/scan/scanner_scheduler.cpp | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/be/src/vec/exec/scan/scanner_scheduler.cpp
b/be/src/vec/exec/scan/scanner_scheduler.cpp
index 1e9b2b837f9..54b2b60d692 100644
--- a/be/src/vec/exec/scan/scanner_scheduler.cpp
+++ b/be/src/vec/exec/scan/scanner_scheduler.cpp
@@ -218,6 +218,8 @@ void
ScannerScheduler::_schedule_scanners(std::shared_ptr<ScannerContext> ctx) {
while (iter != this_run.end()) {
std::shared_ptr<ScannerDelegate> scanner_delegate = (*iter).lock();
if (scanner_delegate == nullptr) {
+ // Has to ++, or there is a dead loop
+ iter++;
continue;
}
scanner_delegate->_scanner->start_wait_worker_timer();
@@ -225,7 +227,7 @@ void
ScannerScheduler::_schedule_scanners(std::shared_ptr<ScannerContext> ctx) {
this->_scanner_scan(this, ctx, scanner_ref);
});
if (s.ok()) {
- this_run.erase(iter++);
+ iter++;
} else {
ctx->set_status_on_error(s);
break;
@@ -235,6 +237,8 @@ void
ScannerScheduler::_schedule_scanners(std::shared_ptr<ScannerContext> ctx) {
while (iter != this_run.end()) {
std::shared_ptr<ScannerDelegate> scanner_delegate = (*iter).lock();
if (scanner_delegate == nullptr) {
+ // Has to ++, or there is a dead loop
+ iter++;
continue;
}
scanner_delegate->_scanner->start_wait_worker_timer();
@@ -264,7 +268,7 @@ void
ScannerScheduler::_schedule_scanners(std::shared_ptr<ScannerContext> ctx) {
ret = _remote_scan_thread_pool->offer(task);
}
if (ret) {
- this_run.erase(iter++);
+ iter++;
} else {
ctx->set_status_on_error(
Status::InternalError("failed to submit scanner to
scanner pool"));
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
