Skip to content

Commit 2ec1a6a

Browse files
authored
[fix](group commit) Modify group commit commit/abort txn timeout as stream load (#39003) (#39069)
pick #39003
1 parent 44cb797 commit 2ec1a6a

File tree

2 files changed

+6
-9
lines changed

2 files changed

+6
-9
lines changed

be/src/olap/wal/wal_table.cpp

+3-6
Original file line numberDiff line numberDiff line change
@@ -172,8 +172,7 @@ Status WalTable::_try_abort_txn(int64_t db_id, std::string& label) {
172172
master_addr.hostname, master_addr.port,
173173
[&request, &result](FrontendServiceConnection& client) {
174174
client->loadTxnRollback(result, request);
175-
},
176-
10000L);
175+
});
177176
auto result_status = Status::create<false>(result.status);
178177
LOG(INFO) << "abort label " << label << ", st:" << st << ", result_status:" << result_status;
179178
return result_status;
@@ -193,10 +192,8 @@ Status WalTable::_replay_wal_internal(const std::string& wal) {
193192
[[maybe_unused]] auto st = _try_abort_txn(_db_id, label);
194193
}
195194
#endif
196-
DBUG_EXECUTE_IF("WalTable.replay_wals.stop", {
197-
// LOG(INFO) << "WalTable.replay_wals.stop";
198-
return Status::InternalError("WalTable.replay_wals.stop");
199-
});
195+
DBUG_EXECUTE_IF("WalTable.replay_wals.stop",
196+
{ return Status::InternalError("WalTable.replay_wals.stop"); });
200197
return _replay_one_wal_with_streamload(wal_id, wal, label);
201198
}
202199

be/src/runtime/group_commit_mgr.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -408,6 +408,7 @@ Status GroupCommitTable::_finish_group_commit_load(int64_t db_id, int64_t table_
408408
request.__set_db_id(db_id);
409409
request.__set_table_id(table_id);
410410
request.__set_txnId(txn_id);
411+
request.__set_thrift_rpc_timeout_ms(config::txn_commit_rpc_timeout_ms);
411412
request.__set_groupCommit(true);
412413
request.__set_receiveBytes(state->num_bytes_load_total());
413414
if (_exec_env->master_info()->__isset.backend_id) {
@@ -425,7 +426,7 @@ Status GroupCommitTable::_finish_group_commit_load(int64_t db_id, int64_t table_
425426
[&request, &result](FrontendServiceConnection& client) {
426427
client->loadTxnCommit(result, request);
427428
},
428-
10000L);
429+
config::txn_commit_rpc_timeout_ms);
429430
result_status = Status::create(result.status);
430431
DBUG_EXECUTE_IF("LoadBlockQueue._finish_group_commit_load.commit_success_and_rpc_error",
431432
{ result_status = Status::InternalError("commit_success_and_rpc_error"); });
@@ -442,8 +443,7 @@ Status GroupCommitTable::_finish_group_commit_load(int64_t db_id, int64_t table_
442443
master_addr.hostname, master_addr.port,
443444
[&request, &result](FrontendServiceConnection& client) {
444445
client->loadTxnRollback(result, request);
445-
},
446-
10000L);
446+
});
447447
result_status = Status::create<false>(result.status);
448448
DBUG_EXECUTE_IF("LoadBlockQueue._finish_group_commit_load.err_status", {
449449
std ::string msg = "abort txn";

0 commit comments

Comments
 (0)