From cf8ceb858601d52ce15d97f46017045e005cd4a9 Mon Sep 17 00:00:00 2001 From: Xinyi Zou Date: Wed, 10 May 2023 09:56:41 +0800 Subject: [PATCH] [fix](scan) fix scanner mem tracker (#19354) --- be/src/runtime/thread_context.h | 2 -- be/src/vec/exec/scan/scanner_scheduler.cpp | 9 +++------ 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/be/src/runtime/thread_context.h b/be/src/runtime/thread_context.h index 6c0fd3d996..84a6423b56 100644 --- a/be/src/runtime/thread_context.h +++ b/be/src/runtime/thread_context.h @@ -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( \ diff --git a/be/src/vec/exec/scan/scanner_scheduler.cpp b/be/src/vec/exec/scan/scanner_scheduler.cpp index 2ec21ced9c..9219570658 100644 --- a/be/src/vec/exec/scan/scanner_scheduler.cpp +++ b/be/src/vec/exec/scan/scanner_scheduler.cpp @@ -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(scanner) == nullptr) { - tracker_config(); + Thread::set_self_name("_scanner_scan"); } #endif scanner->update_wait_worker_timer();