diff --git a/be/src/olap/wal/wal_table.cpp b/be/src/olap/wal/wal_table.cpp index 0de5ee42488d9e..3a29af5cfb93a7 100644 --- a/be/src/olap/wal/wal_table.cpp +++ b/be/src/olap/wal/wal_table.cpp @@ -171,8 +171,7 @@ Status WalTable::_try_abort_txn(int64_t db_id, std::string& label) { master_addr.hostname, master_addr.port, [&request, &result](FrontendServiceConnection& client) { client->loadTxnRollback(result, request); - }, - 10000L); + }); auto result_status = Status::create(result.status); LOG(INFO) << "abort label " << label << ", st:" << st << ", result_status:" << result_status; return result_status; @@ -192,10 +191,8 @@ Status WalTable::_replay_wal_internal(const std::string& wal) { [[maybe_unused]] auto st = _try_abort_txn(_db_id, label); } #endif - DBUG_EXECUTE_IF("WalTable.replay_wals.stop", { - // LOG(INFO) << "WalTable.replay_wals.stop"; - return Status::InternalError("WalTable.replay_wals.stop"); - }); + DBUG_EXECUTE_IF("WalTable.replay_wals.stop", + { return Status::InternalError("WalTable.replay_wals.stop"); }); return _replay_one_wal_with_streamload(wal_id, wal, label); } diff --git a/be/src/runtime/group_commit_mgr.cpp b/be/src/runtime/group_commit_mgr.cpp index e60c3804246b93..0384b502e0af5d 100644 --- a/be/src/runtime/group_commit_mgr.cpp +++ b/be/src/runtime/group_commit_mgr.cpp @@ -446,6 +446,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) { @@ -465,7 +466,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); // DELETE_BITMAP_LOCK_ERROR will be retried if (result_status.ok() || !result_status.is()) { @@ -493,8 +494,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(result.status); DBUG_EXECUTE_IF("LoadBlockQueue._finish_group_commit_load.err_status", { std ::string msg = "abort txn";