You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by da...@apache.org on 2022/10/25 02:51:29 UTC

[doris] branch branch-1.2-unstable updated: [fix](load) clear and notify when an error happens in flushing

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

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


The following commit(s) were added to refs/heads/branch-1.2-unstable by this push:
     new 66ebb075e7 [fix](load) clear and notify when an error happens in flushing
66ebb075e7 is described below

commit 66ebb075e725ac4827fb18624c1120f8ec74605c
Author: Yongqiang YANG <da...@gmail.com>
AuthorDate: Tue Oct 25 02:51:00 2022 +0000

    [fix](load) clear and notify when an error happens in flushing
---
 be/src/runtime/tablets_channel.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/be/src/runtime/tablets_channel.cpp b/be/src/runtime/tablets_channel.cpp
index fa72d23ad0..566c00a19b 100644
--- a/be/src/runtime/tablets_channel.cpp
+++ b/be/src/runtime/tablets_channel.cpp
@@ -276,12 +276,14 @@ Status TabletsChannel::reduce_mem_usage(TabletWriterAddResult* response) {
         _reducing_mem_usage = true;
     }
 
+    Status st = Status::OK();
     for (auto writer : writers_to_flush) {
-        Status st = writer->wait_flush();
+        st = writer->wait_flush();
         if (!st.ok()) {
-            return Status::InternalError(
+            st =  Status::InternalError(
                     "failed to reduce mem consumption by flushing memtable. err: {}",
                     st.to_string());
+            break;
         }
     }
 
@@ -291,7 +293,7 @@ Status TabletsChannel::reduce_mem_usage(TabletWriterAddResult* response) {
         _reduce_memory_cond.notify_all();
     }
 
-    return Status::OK();
+    return st;
 }
 
 Status TabletsChannel::_open_all_writers(const PTabletWriterOpenRequest& request) {


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