database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

[bugfix](scannerdeadloop) there is a dead loop in scanner ctx (#29794)

Browse Source 
Co-authored-by: yiguolei <yiguolei@gmail.com>
This commit is contained in:
yiguolei
2024-01-10 21:48:23 +08:00
committed by yiguolei
parent 223e466514
commit 9ef4e49307
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
be/src/vec/exec/scan/scanner_scheduler.cpp
View File

@ -213,6 +213,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();
@ -220,7 +222,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;
@ -230,6 +232,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();
@ -259,7 +263,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"));