From 770001a6b516cde63edb0c3c9b253dd4a34d9c31 Mon Sep 17 00:00:00 2001 From: Liqi Geng Date: Tue, 28 Apr 2026 14:19:27 +0800 Subject: [PATCH 1/3] This is an automated cherry-pick of #10821 Signed-off-by: ti-chi-bot --- dbms/src/Flash/Mpp/MPPHandler.cpp | 2 +- dbms/src/Flash/Mpp/MPPTask.cpp | 24 +++++++++++++++++++++--- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/dbms/src/Flash/Mpp/MPPHandler.cpp b/dbms/src/Flash/Mpp/MPPHandler.cpp index a19359ace9d..daf00fc59b7 100644 --- a/dbms/src/Flash/Mpp/MPPHandler.cpp +++ b/dbms/src/Flash/Mpp/MPPHandler.cpp @@ -90,7 +90,7 @@ grpc::Status MPPHandler::execute(const ContextPtr & context, mpp::DispatchTaskRe #endif task->run(); - LOG_INFO(log, "processing dispatch is over; the time cost is {} ms", stopwatch.elapsedMilliseconds()); + LOG_DEBUG(log, "processing dispatch is over; the time cost is {} ms", stopwatch.elapsedMilliseconds()); } catch (Exception & e) { diff --git a/dbms/src/Flash/Mpp/MPPTask.cpp b/dbms/src/Flash/Mpp/MPPTask.cpp index cd33dc55ad6..031c606f8d1 100644 --- a/dbms/src/Flash/Mpp/MPPTask.cpp +++ b/dbms/src/Flash/Mpp/MPPTask.cpp @@ -152,7 +152,11 @@ MPPTask::~MPPTask() if (query_memory_tracker != nullptr && current_memory_tracker != query_memory_tracker) current_memory_tracker = query_memory_tracker; abortTunnels("", true); +<<<<<<< HEAD LOG_INFO(log, "finish MPPTask: {}", id.toString()); +======= + LOG_DEBUG(log, "finish MPPTask: {}", id.toString()); +>>>>>>> 830b296199 (Reduce/downgrade some MPPTask logs (#10821)) } bool MPPTask::isRootMPPTask() const @@ -362,11 +366,16 @@ void MPPTask::unregisterTask() { if (is_registered) { + Stopwatch watch; auto [result, reason] = manager->unregisterTask(id, getErrString()); + auto elapsed_ms = watch.elapsedMilliseconds(); if (result) - LOG_DEBUG(log, "task unregistered"); + { + auto log_level = elapsed_ms > 1000 ? Poco::Message::PRIO_INFORMATION : Poco::Message::PRIO_DEBUG; + LOG_IMPL(log, log_level, "task unregistered, time cost is {} ms", elapsed_ms); + } else - LOG_WARNING(log, "task failed to unregister, reason: {}", reason); + LOG_WARNING(log, "task failed to unregister, time cost is {} ms, reason: {}", elapsed_ms, reason); } } @@ -543,8 +552,12 @@ void MPPTask::runImpl() auto time_cost_in_schedule_ns = stopwatch.elapsed() - time_cost_in_preprocess_ns; dag_context->minTSO_wait_time_ns = time_cost_in_schedule_ns; auto time_cost_in_schedule_ms = time_cost_in_schedule_ns / MILLISECOND_TO_NANO; - LOG_INFO( + auto time_cost_before_running_ms = time_cost_in_schedule_ms + time_cost_in_preprocess_ms; + auto log_level + = time_cost_before_running_ms > 1000 ? Poco::Message::PRIO_INFORMATION : Poco::Message::PRIO_DEBUG; + LOG_IMPL( log, + log_level, "task starts running, time cost in schedule: {} ms, time cost in preprocess: {} ms", time_cost_in_schedule_ms, time_cost_in_preprocess_ms); @@ -570,7 +583,12 @@ void MPPTask::runImpl() #endif auto result = query_executor_holder->execute(); +<<<<<<< HEAD auto log_level = Poco::Message::PRIO_DEBUG; +======= + + log_level = Poco::Message::PRIO_DEBUG; +>>>>>>> 830b296199 (Reduce/downgrade some MPPTask logs (#10821)) if (!result.is_success || status != RUNNING) log_level = Poco::Message::PRIO_INFORMATION; LOG_IMPL( From d84d06bb521bb65e20fabee4ab9fc523124053ae Mon Sep 17 00:00:00 2001 From: gengliqi Date: Fri, 29 May 2026 13:52:49 +0800 Subject: [PATCH 2/3] fix conlicts Signed-off-by: gengliqi --- dbms/src/Flash/Mpp/MPPTask.cpp | 8 -------- 1 file changed, 8 deletions(-) diff --git a/dbms/src/Flash/Mpp/MPPTask.cpp b/dbms/src/Flash/Mpp/MPPTask.cpp index 031c606f8d1..07aa4dd52e7 100644 --- a/dbms/src/Flash/Mpp/MPPTask.cpp +++ b/dbms/src/Flash/Mpp/MPPTask.cpp @@ -152,11 +152,7 @@ MPPTask::~MPPTask() if (query_memory_tracker != nullptr && current_memory_tracker != query_memory_tracker) current_memory_tracker = query_memory_tracker; abortTunnels("", true); -<<<<<<< HEAD - LOG_INFO(log, "finish MPPTask: {}", id.toString()); -======= LOG_DEBUG(log, "finish MPPTask: {}", id.toString()); ->>>>>>> 830b296199 (Reduce/downgrade some MPPTask logs (#10821)) } bool MPPTask::isRootMPPTask() const @@ -583,12 +579,8 @@ void MPPTask::runImpl() #endif auto result = query_executor_holder->execute(); -<<<<<<< HEAD - auto log_level = Poco::Message::PRIO_DEBUG; -======= log_level = Poco::Message::PRIO_DEBUG; ->>>>>>> 830b296199 (Reduce/downgrade some MPPTask logs (#10821)) if (!result.is_success || status != RUNNING) log_level = Poco::Message::PRIO_INFORMATION; LOG_IMPL( From ebc78d1b969dca51bb21e62fe41d0712664066a9 Mon Sep 17 00:00:00 2001 From: gengliqi Date: Fri, 29 May 2026 13:54:01 +0800 Subject: [PATCH 3/3] u Signed-off-by: gengliqi --- dbms/src/Flash/Mpp/MPPTask.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/dbms/src/Flash/Mpp/MPPTask.cpp b/dbms/src/Flash/Mpp/MPPTask.cpp index 07aa4dd52e7..7d388dd73ac 100644 --- a/dbms/src/Flash/Mpp/MPPTask.cpp +++ b/dbms/src/Flash/Mpp/MPPTask.cpp @@ -579,7 +579,6 @@ void MPPTask::runImpl() #endif auto result = query_executor_holder->execute(); - log_level = Poco::Message::PRIO_DEBUG; if (!result.is_success || status != RUNNING) log_level = Poco::Message::PRIO_INFORMATION;