fix

ydb-platform · Dec 27, 2024 · 378684e · 378684e
1 parent 1f54c46
commit 378684e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/ydb/core/tx/columnshard/transactions/operators/ev_write/primary.h b/ydb/core/tx/columnshard/transactions/operators/ev_write/primary.h
@@ -131,6 +131,7 @@ class TEvWriteCommitPrimaryTransactionOperator: public TEvWriteCommitSyncTransac
         using TBase = NOlap::NDataSharing::TExtendedTransactionBase<TColumnShard>;
         const ui64 TxId;
         const ui64 TabletId;
+        bool CheckFinishedFlag = false;
 
         virtual bool DoExecute(NTabletFlatExecutor::TTransactionContext& txc, const NActors::TActorContext& /*ctx*/) override {
             auto op = Self->GetProgressTxController().GetTxOperatorVerifiedAs<TEvWriteCommitPrimaryTransactionOperator>(TxId, true);
@@ -141,6 +142,7 @@ class TEvWriteCommitPrimaryTransactionOperator: public TEvWriteCommitSyncTransac
                 AFL_WARN(NKikimrServices::TX_COLUMNSHARD_TX)("event", "ack_tablet_duplication")("wait", JoinSeq(",", op->WaitShardsResultAck))(
                     "receive", TabletId);
             } else {
+                CheckFinishedFlag = true;
                 AFL_DEBUG(NKikimrServices::TX_COLUMNSHARD_TX)("event", "ack_tablet")("wait", JoinSeq(",", op->WaitShardsResultAck))(
                     "receive", TabletId);
                 Self->GetProgressTxController().WriteTxOperatorInfo(txc, TxId, op->SerializeToProto().SerializeAsString());

diff --git a/ydb/core/tx/columnshard/transactions/operators/ev_write/secondary.h b/ydb/core/tx/columnshard/transactions/operators/ev_write/secondary.h
@@ -62,6 +62,7 @@ class TEvWriteCommitSecondaryTransactionOperator: public TEvWriteCommitSyncTrans
     private:
         using TBase = NOlap::NDataSharing::TExtendedTransactionBase<TColumnShard>;
         const ui64 TxId;
+        bool NeedContinueFlag = false;
 
         virtual bool DoExecute(NTabletFlatExecutor::TTransactionContext& txc, const NActors::TActorContext& ctx) override {
             auto op = Self->GetProgressTxController().GetTxOperatorVerifiedAs<TEvWriteCommitSecondaryTransactionOperator>(TxId, true);
@@ -74,12 +75,15 @@ class TEvWriteCommitSecondaryTransactionOperator: public TEvWriteCommitSyncTrans
                 }
                 Self->GetProgressTxController().WriteTxOperatorInfo(txc, TxId, op->SerializeToProto().SerializeAsString());
                 if (!op->NeedReceiveBroken) {
-                    Self->EnqueueProgressTx(ctx, TxId);
+                    NeedContinueFlag = true;
                 }
             }
             return true;
         }
-        virtual void DoComplete(const NActors::TActorContext& /*ctx*/) override {
+        virtual void DoComplete(const NActors::TActorContext& ctx) override {
+            if (NeedContinueFlag) {
+                Self->EnqueueProgressTx(ctx, TxId);
+            }
         }
 
     public:
@@ -111,7 +115,6 @@ class TEvWriteCommitSecondaryTransactionOperator: public TEvWriteCommitSyncTrans
                 if (BrokenFlag) {
                     Self->GetProgressTxController().ExecuteOnCancel(TxId, txc);
                 }
-                Self->EnqueueProgressTx(ctx, TxId);
             }
             return true;
         }
@@ -124,6 +127,7 @@ class TEvWriteCommitSecondaryTransactionOperator: public TEvWriteCommitSyncTrans
                 if (BrokenFlag) {
                     Self->GetProgressTxController().CompleteOnCancel(TxId, ctx);
                 }
+                Self->EnqueueProgressTx(ctx, TxId);
             }
         }