(doris) 02/02: [fix](group commit) Modify group commit commit/abort txn timeout as stream load (#39003)

[dataroaring]

This is an automated email from the ASF dual-hosted git repository.

dataroaring pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/doris.git

commit 3ba46ead8865503ea2e07e99f28e65e4cde7d111
Author: meiyi <myime...@gmail.com>
AuthorDate: Wed Aug 7 23:48:01 2024 +0800

    [fix](group commit) Modify group commit commit/abort txn timeout as stream 
load (#39003)
---
 be/src/olap/wal/wal_table.cpp       | 9 +++------
 be/src/runtime/group_commit_mgr.cpp | 6 +++---
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/be/src/olap/wal/wal_table.cpp b/be/src/olap/wal/wal_table.cpp
index 9573f81c846..e06c80c1a23 100644
--- a/be/src/olap/wal/wal_table.cpp
+++ b/be/src/olap/wal/wal_table.cpp
@@ -174,8 +174,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<false>(result.status);
     LOG(INFO) << "abort label " << label << ", st:" << st << ", 
result_status:" << result_status;
     return result_status;
@@ -195,10 +194,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 d7689cfe940..0e24fb95a35 100644
--- a/be/src/runtime/group_commit_mgr.cpp
+++ b/be/src/runtime/group_commit_mgr.cpp
@@ -444,6 +444,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) {
@@ -463,7 +464,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<ErrorCode::DELETE_BITMAP_LOCK_ERROR>()) {
@@ -491,8 +492,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";


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org