Skip to content

Commit a5dd1b4

Browse files
committed
[fix](group commit) Modify group commit commit/abort txn timeout as stream load
1 parent 7d26e8d commit a5dd1b4

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

be/src/olap/wal/wal_table.cpp

+1-3
Original file line numberDiff line numberDiff line change
@@ -171,8 +171,7 @@ Status WalTable::_try_abort_txn(int64_t db_id, std::string& label) {
171171
master_addr.hostname, master_addr.port,
172172
[&request, &result](FrontendServiceConnection& client) {
173173
client->loadTxnRollback(result, request);
174-
},
175-
10000L);
174+
});
176175
auto result_status = Status::create<false>(result.status);
177176
LOG(INFO) << "abort label " << label << ", st:" << st << ", result_status:" << result_status;
178177
return result_status;
@@ -193,7 +192,6 @@ Status WalTable::_replay_wal_internal(const std::string& wal) {
193192
}
194193
#endif
195194
DBUG_EXECUTE_IF("WalTable.replay_wals.stop", {
196-
// LOG(INFO) << "WalTable.replay_wals.stop";
197195
return Status::InternalError("WalTable.replay_wals.stop");
198196
});
199197
return _replay_one_wal_with_streamload(wal_id, wal, label);

be/src/runtime/group_commit_mgr.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -446,6 +446,7 @@ Status GroupCommitTable::_finish_group_commit_load(int64_t db_id, int64_t table_
446446
request.__set_db_id(db_id);
447447
request.__set_table_id(table_id);
448448
request.__set_txnId(txn_id);
449+
request.__set_thrift_rpc_timeout_ms(config::txn_commit_rpc_timeout_ms);
449450
request.__set_groupCommit(true);
450451
request.__set_receiveBytes(state->num_bytes_load_total());
451452
if (_exec_env->master_info()->__isset.backend_id) {
@@ -465,7 +466,7 @@ Status GroupCommitTable::_finish_group_commit_load(int64_t db_id, int64_t table_
465466
[&request, &result](FrontendServiceConnection& client) {
466467
client->loadTxnCommit(result, request);
467468
},
468-
10000L);
469+
config::txn_commit_rpc_timeout_ms);
469470
result_status = Status::create(result.status);
470471
// DELETE_BITMAP_LOCK_ERROR will be retried
471472
if (result_status.ok() || !result_status.is<ErrorCode::DELETE_BITMAP_LOCK_ERROR>()) {
@@ -493,8 +494,7 @@ Status GroupCommitTable::_finish_group_commit_load(int64_t db_id, int64_t table_
493494
master_addr.hostname, master_addr.port,
494495
[&request, &result](FrontendServiceConnection& client) {
495496
client->loadTxnRollback(result, request);
496-
},
497-
10000L);
497+
});
498498
result_status = Status::create<false>(result.status);
499499
DBUG_EXECUTE_IF("LoadBlockQueue._finish_group_commit_load.err_status", {
500500
std ::string msg = "abort txn";

0 commit comments

Comments
 (0)