fixes

ydb-platform · May 15, 2024 · bbb9214 · bbb9214
1 parent cfcaf47
commit bbb9214
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/ydb/core/tx/columnshard/data_sharing/destination/session/destination.cpp b/ydb/core/tx/columnshard/data_sharing/destination/session/destination.cpp
@@ -95,9 +95,8 @@ NKikimr::TConclusion<std::unique_ptr<NTabletFlatExecutor::ITransaction>> TDestin
 }
 
 NKikimr::TConclusion<std::unique_ptr<NTabletFlatExecutor::ITransaction>> TDestinationSession::ReceiveFinished(NColumnShard::TColumnShard* self, const TTabletId sourceTabletId, const std::shared_ptr<TDestinationSession>& selfPtr) {
-    auto result = GetCursorVerified(sourceTabletId).ReceiveFinished();
-    if (!result) {
-        return result;
+    if (GetCursorVerified(sourceTabletId).GetDataFinished()) {
+        return TConclusionStatus::Fail("session finished already");
     }
     return std::unique_ptr<NTabletFlatExecutor::ITransaction>(new TTxFinishFromSource(self, sourceTabletId, selfPtr));
 }

diff --git a/ydb/core/tx/columnshard/data_sharing/destination/transactions/tx_finish_from_source.cpp b/ydb/core/tx/columnshard/data_sharing/destination/transactions/tx_finish_from_source.cpp
@@ -8,7 +8,7 @@ bool TTxFinishFromSource::DoExecute(NTabletFlatExecutor::TTransactionContext& tx
     NIceDb::TNiceDb db(txc.DB);
     db.Table<Schema::DestinationSessions>().Key(Session->GetSessionId())
         .Update(NIceDb::TUpdate<Schema::DestinationSessions::Cursor>(Session->SerializeCursorToProto().SerializeAsString()));
-    if (Session->GetSourcesInProgressCount() == 1) {
+    if (Session->GetSourcesInProgressCount() == 0) {
         Finished = true;
         if (Session->GetTransferContext().GetTxId()) {
             Self->GetProgressTxController().FinishProposeOnExecute(*Session->GetTransferContext().GetTxId(), txc);

diff --git a/ydb/core/tx/columnshard/data_sharing/destination/transactions/tx_finish_from_source.h b/ydb/core/tx/columnshard/data_sharing/destination/transactions/tx_finish_from_source.h
@@ -20,6 +20,7 @@ class TTxFinishFromSource: public TExtendedTransactionBase<NColumnShard::TColumn
         , Session(session)
         , SourceTabletId(sourceTabletId)
     {
+        Session->GetCursorVerified(SourceTabletId).ReceiveFinished().Validate();
     }
 
     TTxType GetTxType() const override { return NColumnShard::TXTYPE_DATA_SHARING_FINISH_FROM_SOURCE; }