[doris] branch dev-1.1.2 updated: [fix](memtracker) Fix the exceeded limit of the first query execution (#12338)

[yiguolei]

This is an automated email from the ASF dual-hosted git repository.

yiguolei pushed a commit to branch dev-1.1.2
in repository https://gitbox.apache.org/repos/asf/doris.git


The following commit(s) were added to refs/heads/dev-1.1.2 by this push:
     new 59f34e5118 [fix](memtracker) Fix the exceeded limit of the first query 
execution (#12338)
59f34e5118 is described below

commit 59f34e5118a6dc4813b4e9cdf0dc780bb690f730
Author: Xinyi Zou <zouxiny...@gmail.com>
AuthorDate: Mon Sep 5 20:06:07 2022 +0800

    [fix](memtracker) Fix the exceeded limit of the first query execution 
(#12338)
---
 be/src/exec/olap_scan_node.cpp              | 2 +-
 be/src/runtime/memory/mem_tracker_limiter.h | 2 +-
 be/src/vec/exec/volap_scan_node.cpp         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/be/src/exec/olap_scan_node.cpp b/be/src/exec/olap_scan_node.cpp
index 9728922a0a..28053ff5ef 100644
--- a/be/src/exec/olap_scan_node.cpp
+++ b/be/src/exec/olap_scan_node.cpp
@@ -1529,7 +1529,7 @@ void OlapScanNode::transfer_thread(RuntimeState* state) {
 }
 
 void OlapScanNode::scanner_thread(OlapScanner* scanner) {
-    SCOPED_ATTACH_TASK(_runtime_state);
+    // SCOPED_ATTACH_TASK(_runtime_state);
     if (UNLIKELY(_transfer_done)) {
         _scanner_done = true;
         std::unique_lock<std::mutex> l(_scan_batches_lock);
diff --git a/be/src/runtime/memory/mem_tracker_limiter.h 
b/be/src/runtime/memory/mem_tracker_limiter.h
index e9c7957464..c2541b6aea 100644
--- a/be/src/runtime/memory/mem_tracker_limiter.h
+++ b/be/src/runtime/memory/mem_tracker_limiter.h
@@ -266,7 +266,7 @@ inline void MemTrackerLimiter::cache_consume_local(int64_t 
bytes) {
     if (consume_bytes != 0) {
         for (auto& tracker : _all_ancestors) {
             if (tracker->label() == "Process") return;
-            tracker->_consumption->add(bytes);
+            tracker->_consumption->add(consume_bytes);
         }
     }
 }
diff --git a/be/src/vec/exec/volap_scan_node.cpp 
b/be/src/vec/exec/volap_scan_node.cpp
index d535c48d61..2a06138767 100644
--- a/be/src/vec/exec/volap_scan_node.cpp
+++ b/be/src/vec/exec/volap_scan_node.cpp
@@ -148,7 +148,7 @@ void VOlapScanNode::transfer_thread(RuntimeState* state) {
 }
 
 void VOlapScanNode::scanner_thread(VOlapScanner* scanner) {
-    SCOPED_ATTACH_TASK(_runtime_state);
+    // SCOPED_ATTACH_TASK(_runtime_state); // TODO Recorded on an independent 
tracker
     int64_t wait_time = scanner->update_wait_worker_timer();
     // Do not use ScopedTimer. There is no guarantee that, the counter
     // (_scan_cpu_timer, the class member) is not destroyed after 
`_running_thread==0`.


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org