Skip to content

Commit 3ba46ea

Browse files
mymeiyidataroaring
authored andcommitted
[fix](group commit) Modify group commit commit/abort txn timeout as stream load (#39003)
1 parent 6217073 commit 3ba46ea

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
@@ -174,8 +174,7 @@ Status WalTable::_try_abort_txn(int64_t db_id, std::string& label) {
174174
master_addr.hostname, master_addr.port,
175175
[&request, &result](FrontendServiceConnection& client) {
176176
client->loadTxnRollback(result, request);
177-
},
178-
10000L);
177+
});
179178
auto result_status = Status::create<false>(result.status);
180179
LOG(INFO) << "abort label " << label << ", st:" << st << ", result_status:" << result_status;
181180
return result_status;
@@ -195,10 +194,8 @@ Status WalTable::_replay_wal_internal(const std::string& wal) {
195194
[[maybe_unused]] auto st = _try_abort_txn(_db_id, label);
196195
}
197196
#endif
198-
DBUG_EXECUTE_IF("WalTable.replay_wals.stop", {
199-
// LOG(INFO) << "WalTable.replay_wals.stop";
200-
return Status::InternalError("WalTable.replay_wals.stop");
201-
});
197+
DBUG_EXECUTE_IF("WalTable.replay_wals.stop",
198+
{ return Status::InternalError("WalTable.replay_wals.stop"); });
202199
return _replay_one_wal_with_streamload(wal_id, wal, label);
203200
}
204201

be/src/runtime/group_commit_mgr.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -444,6 +444,7 @@ Status GroupCommitTable::_finish_group_commit_load(int64_t db_id, int64_t table_
444444
request.__set_db_id(db_id);
445445
request.__set_table_id(table_id);
446446
request.__set_txnId(txn_id);
447+
request.__set_thrift_rpc_timeout_ms(config::txn_commit_rpc_timeout_ms);
447448
request.__set_groupCommit(true);
448449
request.__set_receiveBytes(state->num_bytes_load_total());
449450
if (_exec_env->master_info()->__isset.backend_id) {
@@ -463,7 +464,7 @@ Status GroupCommitTable::_finish_group_commit_load(int64_t db_id, int64_t table_
463464
[&request, &result](FrontendServiceConnection& client) {
464465
client->loadTxnCommit(result, request);
465466
},
466-
10000L);
467+
config::txn_commit_rpc_timeout_ms);
467468
result_status = Status::create(result.status);
468469
// DELETE_BITMAP_LOCK_ERROR will be retried
469470
if (result_status.ok() || !result_status.is<ErrorCode::DELETE_BITMAP_LOCK_ERROR>()) {
@@ -491,8 +492,7 @@ Status GroupCommitTable::_finish_group_commit_load(int64_t db_id, int64_t table_
491492
master_addr.hostname, master_addr.port,
492493
[&request, &result](FrontendServiceConnection& client) {
493494
client->loadTxnRollback(result, request);
494-
},
495-
10000L);
495+
});
496496
result_status = Status::create<false>(result.status);
497497
DBUG_EXECUTE_IF("LoadBlockQueue._finish_group_commit_load.err_status", {
498498
std ::string msg = "abort txn";

0 commit comments

Comments
 (0)