pick https://github.com/apache/doris/pull/39003
This commit is contained in:
@ -408,6 +408,7 @@ Status GroupCommitTable::_finish_group_commit_load(int64_t db_id, int64_t table_
|
||||
request.__set_db_id(db_id);
|
||||
request.__set_table_id(table_id);
|
||||
request.__set_txnId(txn_id);
|
||||
request.__set_thrift_rpc_timeout_ms(config::txn_commit_rpc_timeout_ms);
|
||||
request.__set_groupCommit(true);
|
||||
request.__set_receiveBytes(state->num_bytes_load_total());
|
||||
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_
|
||||
[&request, &result](FrontendServiceConnection& client) {
|
||||
client->loadTxnCommit(result, request);
|
||||
},
|
||||
10000L);
|
||||
config::txn_commit_rpc_timeout_ms);
|
||||
result_status = Status::create(result.status);
|
||||
DBUG_EXECUTE_IF("LoadBlockQueue._finish_group_commit_load.commit_success_and_rpc_error",
|
||||
{ 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_
|
||||
master_addr.hostname, master_addr.port,
|
||||
[&request, &result](FrontendServiceConnection& client) {
|
||||
client->loadTxnRollback(result, request);
|
||||
},
|
||||
10000L);
|
||||
});
|
||||
result_status = Status::create<false>(result.status);
|
||||
DBUG_EXECUTE_IF("LoadBlockQueue._finish_group_commit_load.err_status", {
|
||||
std ::string msg = "abort txn";
|
||||
|
||||
Reference in New Issue
Block a user