From a86a8f5e577a21668711c8a30c29950dd2a19459 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 27 Jul 2025 15:59:20 +0800 Subject: [PATCH] branch-2.1: [fix](case) fix group commit case #53292 (#53431) Cherry-picked from #53292 Co-authored-by: meiyi --- be/src/runtime/group_commit_mgr.cpp | 15 +++++++++------ ...up_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 512d42e84e..1b5d1d5729 100644 --- a/be/src/runtime/group_commit_mgr.cpp +++ b/be/src/runtime/group_commit_mgr.cpp @@ -398,13 +398,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; request.__set_auth_code(0); // this is a fake, fe not check it now @@ -479,8 +481,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())) { 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 c9e22504b1..d4207fda71 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 {