[doris] branch branch-1.1-lts updated: [fix](be_ut) fix endless loop in parquet scan when do parquet_scanner_test ut and es_http_scan_node_test failure (#13217)

[zouxinyi]

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

zouxinyi pushed a commit to branch branch-1.1-lts
in repository https://gitbox.apache.org/repos/asf/doris.git


The following commit(s) were added to refs/heads/branch-1.1-lts by this push:
     new 1539b661cb [fix](be_ut) fix endless loop in parquet scan when do 
parquet_scanner_test ut and es_http_scan_node_test failure (#13217)
1539b661cb is described below

commit 1539b661cbcb5321f6a6843141212d54e7d01e31
Author: caiconghui <55968745+caicong...@users.noreply.github.com>
AuthorDate: Sun Oct 9 22:26:25 2022 +0800

    [fix](be_ut) fix endless loop in parquet scan when do parquet_scanner_test 
ut and es_http_scan_node_test failure (#13217)
    
    Co-authored-by: caiconghui1 <caicongh...@jd.com>
---
 be/src/runtime/memory/mem_tracker_limiter.cpp | 2 ++
 be/test/exec/parquet_scanner_test.cpp         | 1 +
 2 files changed, 3 insertions(+)

diff --git a/be/src/runtime/memory/mem_tracker_limiter.cpp 
b/be/src/runtime/memory/mem_tracker_limiter.cpp
index a8e6315f74..9b4eedea65 100644
--- a/be/src/runtime/memory/mem_tracker_limiter.cpp
+++ b/be/src/runtime/memory/mem_tracker_limiter.cpp
@@ -73,7 +73,9 @@ MemTrackerLimiter::MemTrackerLimiter(int64_t byte_limit, 
const std::string& labe
 
 MemTrackerLimiter::~MemTrackerLimiter() {
     // TCMalloc hook will be triggered during destructor memtracker, may cause 
crash.
+#ifndef BE_TEST
     if (_label == "Process") doris::thread_context_ptr._init = false;
+#endif
     DCHECK(remain_child_count() == 0 || _label == "Process");
     // In order to ensure `consumption of all limiter trackers` + `orphan 
tracker consumption` = `process tracker consumption`
     // in real time. Merge its consumption into orphan when parent is process, 
to avoid repetition.
diff --git a/be/test/exec/parquet_scanner_test.cpp 
b/be/test/exec/parquet_scanner_test.cpp
index e299f71c59..2e5eeded8f 100644
--- a/be/test/exec/parquet_scanner_test.cpp
+++ b/be/test/exec/parquet_scanner_test.cpp
@@ -421,6 +421,7 @@ void ParquetScannerTest::init() {
 }
 
 TEST_F(ParquetScannerTest, normal) {
+    config::parquet_reader_max_buffer_size = 50;
     BrokerScanNode scan_node(&_obj_pool, _tnode, *_desc_tbl);
     scan_node.init(_tnode);
     auto status = scan_node.prepare(&_runtime_state);


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