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

[fix](scan) fix scanner mem tracker (#19354)

Browse Source
This commit is contained in:
Xinyi Zou
2023-05-10 09:56:41 +08:00
committed by GitHub
parent b2371c1246
commit cf8ceb8586
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
be/src/runtime/thread_context.h
View File

@ -41,8 +41,6 @@
doris::enable_thread_catch_bad_alloc++; \
Defer defer {[&]() { doris::enable_thread_catch_bad_alloc--; }}; \
{ stmt; } \
} catch (std::bad_alloc const& e) { \
return Status::MemoryLimitExceeded(fmt::format("PreCatch {}", e.what())); \
} catch (const doris::Exception& e) { \
if (e.code() == doris::ErrorCode::MEM_ALLOC_FAILED) { \
return Status::MemoryLimitExceeded( \

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

@ -261,15 +261,12 @@ void ScannerScheduler::_schedule_scanners(ScannerContext* ctx) {
void ScannerScheduler::_scanner_scan(ScannerScheduler* scheduler, ScannerContext* ctx,
VScannerSPtr scanner) {
auto tracker_config = [&] {
SCOPED_ATTACH_TASK(scanner->runtime_state());
Thread::set_self_name("_scanner_scan");
};
SCOPED_ATTACH_TASK(scanner->runtime_state());
#if !defined(USE_BTHREAD_SCANNER)
tracker_config();
Thread::set_self_name("_scanner_scan");
#else
if (dynamic_cast<NewOlapScanner*>(scanner) == nullptr) {
tracker_config();
Thread::set_self_name("_scanner_scan");
}
#endif
scanner->update_wait_worker_timer();