This is an automated email from the ASF dual-hosted git repository.
yiguolei 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 f3204ec18c4 [fix](memory) Fix thread_context check failed:
thread_mem_tracker()->label() == "Orphan" #27468
f3204ec18c4 is described below
commit f3204ec18c4c8b4cfcb34d95ae75561714c2f411
Author: Xinyi Zou <[email protected]>
AuthorDate: Fri Nov 24 20:57:41 2023 +0800
[fix](memory) Fix thread_context check failed:
thread_mem_tracker()->label() == "Orphan" #27468
---
be/src/pipeline/pipeline_fragment_context.cpp | 2 +-
be/src/pipeline/pipeline_x/pipeline_x_fragment_context.cpp | 2 +-
be/src/runtime/plan_fragment_executor.cpp | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/be/src/pipeline/pipeline_fragment_context.cpp
b/be/src/pipeline/pipeline_fragment_context.cpp
index d4c2fd2b694..8ac3f1afc48 100644
--- a/be/src/pipeline/pipeline_fragment_context.cpp
+++ b/be/src/pipeline/pipeline_fragment_context.cpp
@@ -138,7 +138,7 @@ PipelineFragmentContext::~PipelineFragmentContext() {
auto st = _query_ctx->exec_status();
if (_runtime_state != nullptr) {
// The memory released by the query end is recorded in the query mem
tracker, main memory in _runtime_state.
- SCOPED_ATTACH_TASK(_runtime_state.get());
+
SCOPED_SWITCH_THREAD_MEM_TRACKER_LIMITER(_runtime_state->query_mem_tracker());
_call_back(_runtime_state.get(), &st);
_runtime_state.reset();
} else {
diff --git a/be/src/pipeline/pipeline_x/pipeline_x_fragment_context.cpp
b/be/src/pipeline/pipeline_x/pipeline_x_fragment_context.cpp
index 33587c31dfc..3d7b8ea42b9 100644
--- a/be/src/pipeline/pipeline_x/pipeline_x_fragment_context.cpp
+++ b/be/src/pipeline/pipeline_x/pipeline_x_fragment_context.cpp
@@ -116,7 +116,7 @@ PipelineXFragmentContext::~PipelineXFragmentContext() {
auto st = _query_ctx->exec_status();
if (!_runtime_states.empty()) {
// The memory released by the query end is recorded in the query mem
tracker, main memory in _runtime_state.
- SCOPED_ATTACH_TASK(_runtime_state.get());
+
SCOPED_SWITCH_THREAD_MEM_TRACKER_LIMITER(_runtime_state->query_mem_tracker());
FOR_EACH_RUNTIME_STATE(_call_back(runtime_state.get(), &st);
runtime_state.reset();)
} else {
_call_back(nullptr, &st);
diff --git a/be/src/runtime/plan_fragment_executor.cpp
b/be/src/runtime/plan_fragment_executor.cpp
index dc7fb350b6c..2ee14ffe894 100644
--- a/be/src/runtime/plan_fragment_executor.cpp
+++ b/be/src/runtime/plan_fragment_executor.cpp
@@ -100,7 +100,7 @@ PlanFragmentExecutor::PlanFragmentExecutor(ExecEnv*
exec_env,
PlanFragmentExecutor::~PlanFragmentExecutor() {
if (_runtime_state != nullptr) {
// The memory released by the query end is recorded in the query mem
tracker, main memory in _runtime_state.
- SCOPED_ATTACH_TASK(_runtime_state.get());
+
SCOPED_SWITCH_THREAD_MEM_TRACKER_LIMITER(_runtime_state->query_mem_tracker());
close();
_runtime_state.reset();
} else {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
