This is an automated email from the ASF dual-hosted git repository.
dataroaring pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.1 by this push:
new 70f46c12b3e [improve](group commit) Pick Modify group commit case and
modify cancel status (#35995) (#37398)
70f46c12b3e is described below
commit 70f46c12b3ee2b65136ff4cc2a80ce81cc304e31
Author: meiyi <[email protected]>
AuthorDate: Mon Jul 8 10:27:08 2024 +0800
[improve](group commit) Pick Modify group commit case and modify cancel
status (#35995) (#37398)
Pick https://github.com/apache/doris/pull/35995
---
be/src/runtime/group_commit_mgr.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/be/src/runtime/group_commit_mgr.cpp
b/be/src/runtime/group_commit_mgr.cpp
index d5daf2af530..32b28fd7657 100644
--- a/be/src/runtime/group_commit_mgr.cpp
+++ b/be/src/runtime/group_commit_mgr.cpp
@@ -147,7 +147,8 @@ Status LoadBlockQueue::get_block(RuntimeState*
runtime_state, vectorized::Block*
if (runtime_state->is_cancelled()) {
auto st = Status::Cancelled<false>(runtime_state->cancel_reason());
_cancel_without_lock(st);
- return st;
+ return Status::Cancelled("cancel group_commit, label=" + label +
+ ", status=" + st.to_string());
}
if (!_block_queue.empty()) {
const BlockData block_data = _block_queue.front();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
