[doris] 02/03: [fix](txn) persist txn record of single replica load and ccr ingestion (#24543)

[kxiao]

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

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

commit c2a402252da51ee144b9180819db4ac3cee54b7f
Author: Yongqiang YANG <98214048+dataroar...@users.noreply.github.com>
AuthorDate: Tue Sep 19 15:10:38 2023 +0800

    [fix](txn) persist txn record of single replica load and ccr ingestion 
(#24543)
    
    Otherwise txn would be dropped when a be reboots.
---
 be/src/service/backend_service.cpp  | 2 +-
 be/src/service/internal_service.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/be/src/service/backend_service.cpp 
b/be/src/service/backend_service.cpp
index a122c8375e..0ac0cdfc61 100644
--- a/be/src/service/backend_service.cpp
+++ b/be/src/service/backend_service.cpp
@@ -691,7 +691,7 @@ void BackendService::ingest_binlog(TIngestBinlogResult& 
result,
     Status commit_txn_status = 
StorageEngine::instance()->txn_manager()->commit_txn(
             local_tablet->data_dir()->get_meta(), rowset_meta->partition_id(),
             rowset_meta->txn_id(), rowset_meta->tablet_id(), 
rowset_meta->tablet_schema_hash(),
-            local_tablet->tablet_uid(), rowset_meta->load_id(), rowset, true);
+            local_tablet->tablet_uid(), rowset_meta->load_id(), rowset, false);
     if (!commit_txn_status && 
!commit_txn_status.is<ErrorCode::PUSH_TRANSACTION_ALREADY_EXIST>()) {
         auto err_msg = fmt::format(
                 "failed to commit txn for remote tablet. rowset_id: {}, 
remote_tablet_id={}, "
diff --git a/be/src/service/internal_service.cpp 
b/be/src/service/internal_service.cpp
index b8a763357c..eef92a12a8 100644
--- a/be/src/service/internal_service.cpp
+++ b/be/src/service/internal_service.cpp
@@ -1355,7 +1355,7 @@ void 
PInternalServiceImpl::request_slave_tablet_pull_rowset(
         Status commit_txn_status = 
StorageEngine::instance()->txn_manager()->commit_txn(
                 tablet->data_dir()->get_meta(), rowset_meta->partition_id(), 
rowset_meta->txn_id(),
                 rowset_meta->tablet_id(), rowset_meta->tablet_schema_hash(), 
tablet->tablet_uid(),
-                rowset_meta->load_id(), rowset, true);
+                rowset_meta->load_id(), rowset, false);
         if (!commit_txn_status && 
!commit_txn_status.is<PUSH_TRANSACTION_ALREADY_EXIST>()) {
             LOG(WARNING) << "failed to add committed rowset for slave replica. 
rowset_id="
                          << rowset_meta->rowset_id() << ", tablet_id=" << 
rowset_meta->tablet_id()


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