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

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


The following commit(s) were added to refs/heads/branch-3.1 by this push:
     new 7f216fc71cd branch-3.1: [fix](move-memtable) gracefully shutdown flush 
token in TabletStream::pre_close #52719 (#52778)
7f216fc71cd is described below

commit 7f216fc71cda394026e773f640c71d1be057398f
Author: github-actions[bot] 
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Mon Jul 7 14:43:45 2025 +0800

    branch-3.1: [fix](move-memtable) gracefully shutdown flush token in 
TabletStream::pre_close #52719 (#52778)
    
    Cherry-picked from #52719
    
    Co-authored-by: Kaijie Chen <[email protected]>
---
 be/src/runtime/load_stream.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/be/src/runtime/load_stream.cpp b/be/src/runtime/load_stream.cpp
index 1a386341f89..42db372c170 100644
--- a/be/src/runtime/load_stream.cpp
+++ b/be/src/runtime/load_stream.cpp
@@ -296,6 +296,8 @@ Status 
TabletStream::_run_in_heavy_work_pool(std::function<Status()> fn) {
 
 void TabletStream::pre_close() {
     if (!_status.ok()) {
+        // cancel all pending tasks, wait all running tasks to finish
+        _flush_token->shutdown();
         return;
     }
 


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to