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 c1f7fb23487 branch-3.1: [fix](case) fix group commit case #53292
(#53432)
c1f7fb23487 is described below
commit c1f7fb23487a796b7503452da9bce79c1bf80c4a
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Fri Jul 18 10:47:45 2025 +0800
branch-3.1: [fix](case) fix group commit case #53292 (#53432)
Cherry-picked from #53292
Co-authored-by: meiyi <[email protected]>
---
be/src/runtime/group_commit_mgr.cpp | 15 +++++++++------
...test_group_commit_async_wal_msg_fault_injection.groovy | 4 ++--
2 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/be/src/runtime/group_commit_mgr.cpp
b/be/src/runtime/group_commit_mgr.cpp
index 553da51a96b..c8397e5a110 100644
--- a/be/src/runtime/group_commit_mgr.cpp
+++ b/be/src/runtime/group_commit_mgr.cpp
@@ -430,13 +430,15 @@ Status
GroupCommitTable::_finish_group_commit_load(int64_t db_id, int64_t table_
RuntimeState* state) {
Status st;
Status result_status;
- DBUG_EXECUTE_IF("LoadBlockQueue._finish_group_commit_load.err_status",
- { status = Status::InternalError(""); });
+ DBUG_EXECUTE_IF("LoadBlockQueue._finish_group_commit_load.err_status", {
+ status =
Status::InternalError("LoadBlockQueue._finish_group_commit_load.err_status");
+ });
DBUG_EXECUTE_IF("LoadBlockQueue._finish_group_commit_load.load_error",
{ status = Status::InternalError("load_error"); });
if (status.ok()) {
-
DBUG_EXECUTE_IF("LoadBlockQueue._finish_group_commit_load.commit_error",
- { status = Status::InternalError(""); });
+
DBUG_EXECUTE_IF("LoadBlockQueue._finish_group_commit_load.commit_error", {
+ status =
Status::InternalError("LoadBlockQueue._finish_group_commit_load.commit_error");
+ });
// commit txn
TLoadTxnCommitRequest request;
// deprecated and should be removed in 3.1, use token instead
@@ -529,8 +531,9 @@ Status GroupCommitTable::_finish_group_commit_load(int64_t
db_id, int64_t table_
// status: exec_plan_fragment result
// st: commit txn rpc status
// result_status: commit txn result
- DBUG_EXECUTE_IF("LoadBlockQueue._finish_group_commit_load.err_st",
- { st = Status::InternalError(""); });
+ DBUG_EXECUTE_IF("LoadBlockQueue._finish_group_commit_load.err_st", {
+ st =
Status::InternalError("LoadBlockQueue._finish_group_commit_load.err_st");
+ });
if (status.ok() && st.ok() &&
(result_status.ok() ||
result_status.is<ErrorCode::PUBLISH_TIMEOUT>())) {
if (!config::group_commit_wait_replay_wal_finish) {
diff --git
a/regression-test/suites/fault_injection_p0/test_group_commit_async_wal_msg_fault_injection.groovy
b/regression-test/suites/fault_injection_p0/test_group_commit_async_wal_msg_fault_injection.groovy
index 2d0b91a01ed..0f572986bdc 100644
---
a/regression-test/suites/fault_injection_p0/test_group_commit_async_wal_msg_fault_injection.groovy
+++
b/regression-test/suites/fault_injection_p0/test_group_commit_async_wal_msg_fault_injection.groovy
@@ -156,7 +156,7 @@
suite("test_group_commit_async_wal_msg_fault_injection","nonConcurrent") {
) engine=olap
DISTRIBUTED BY HASH(`k`)
BUCKETS 5
- properties("replication_num" = "1", "group_commit_interval_ms" =
"4000")
+ properties("replication_num" = "1", "group_commit_interval_ms" =
"10000")
"""
GetDebugPoint().clearDebugPointsForAllBEs()
try {
@@ -167,7 +167,7 @@
suite("test_group_commit_async_wal_msg_fault_injection","nonConcurrent") {
set 'group_commit', 'async_mode'
unset 'label'
file 'group_commit_wal_msg.csv'
- time 10000
+ time 6000
}
getRowCount(5)
} finally {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
