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

dataroaring pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/doris.git


The following commit(s) were added to refs/heads/branch-3.0 by this push:
     new b85c39462ea branch-3.0: [improve](load) do not block delta writer if 
memtable memory is low #42649 (#43943)
b85c39462ea is described below

commit b85c39462eaa8821bdb38b270f605ccdd73bc8bb
Author: github-actions[bot] 
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Thu Nov 14 19:09:34 2024 +0800

    branch-3.0: [improve](load) do not block delta writer if memtable memory is 
low #42649 (#43943)
    
    Cherry-picked from #42649
    
    Co-authored-by: Kaijie Chen <chenkai...@selectdb.com>
---
 be/src/olap/memtable_memory_limiter.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/be/src/olap/memtable_memory_limiter.cpp 
b/be/src/olap/memtable_memory_limiter.cpp
index 1cb6c0c8e2d..043ce9967fb 100644
--- a/be/src/olap/memtable_memory_limiter.cpp
+++ b/be/src/olap/memtable_memory_limiter.cpp
@@ -141,7 +141,7 @@ void MemTableMemoryLimiter::handle_memtable_flush() {
                       << ", flush: " << 
PrettyPrinter::print_bytes(_flush_mem_usage);
             _flush_active_memtables(need_flush);
         }
-    } while (_hard_limit_reached());
+    } while (_hard_limit_reached() && !_load_usage_low());
     g_memtable_memory_limit_waiting_threads << -1;
     timer.stop();
     int64_t time_ms = timer.elapsed_time() / 1000 / 1000;


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

Reply via email to