This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-4.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-4.1 by this push:
new 4fed0dd96c5 branch-4.1: [fix](be) keep FlushToken running count
symmetric on cancel #61684 (#61796)
4fed0dd96c5 is described below
commit 4fed0dd96c53f398da9fc3b98aad48a5f6cadc40
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Mon Mar 30 10:32:06 2026 +0800
branch-4.1: [fix](be) keep FlushToken running count symmetric on cancel
#61684 (#61796)
Cherry-picked from #61684
Co-authored-by: Xin Liao <[email protected]>
---
be/src/load/memtable/memtable_flush_executor.cpp | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/be/src/load/memtable/memtable_flush_executor.cpp
b/be/src/load/memtable/memtable_flush_executor.cpp
index 93134a2d05c..bfbba1bd6a1 100644
--- a/be/src/load/memtable/memtable_flush_executor.cpp
+++ b/be/src/load/memtable/memtable_flush_executor.cpp
@@ -222,6 +222,9 @@ void FlushToken::_flush_memtable(std::shared_ptr<MemTable>
memtable_ptr, int32_t
int64_t submit_task_time) {
signal::set_signal_task_id(_rowset_writer->load_id());
signal::tablet_id = memtable_ptr->tablet_id();
+ // Count the task as running before registering the deferred cleanup so
+ // cancel/shutdown paths keep flush_running_count symmetric on every exit.
+ _stats.flush_running_count++;
Defer defer {[&]() {
std::lock_guard<std::mutex> lock(_mutex);
_stats.flush_submit_count--;
@@ -240,7 +243,6 @@ void FlushToken::_flush_memtable(std::shared_ptr<MemTable>
memtable_ptr, int32_t
}
DBUG_EXECUTE_IF("FlushToken.flush_memtable.wait_after_first_shutdown",
{ std::this_thread::sleep_for(std::chrono::milliseconds(10
* 1000)); });
- _stats.flush_running_count++;
// double check if shutdown to avoid wait running task finish count not
accurate
if (_is_shutdown()) {
return;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
