fix

Author: nshestakov

ydb/core/persqueue/partition.cpp

@@ -2360,16 +2360,6 @@ std::pair<bool, bool> TPartition::ValidatePartitionOperation(const NKikimrPQ::TP
 
     TUserInfoBase& userInfo = GetOrCreatePendingUser(consumer);
 
-    PQ_LOG_D("CommitOperation Partition " << Partition <<
-        " Consumer '" << consumer << "'" <<
-        " RequestSessionId '" << operation.GetReadSessionId() <<
-        "' CurrentSessionId '" << userInfo.Session <<
-        "' OffsetBegin " << operation.GetCommitOffsetsBegin() <<
-        "' OffsetEnd " << operation.GetCommitOffsetsEnd() <<
-        " OnlyCheckCommitedToFinish " << operation.GetOnlyCheckCommitedToFinish() <<
-        " KillReadSession " << operation.GetKillReadSession()
-    );
-
     if (!operation.GetReadSessionId().empty() && operation.GetReadSessionId() != userInfo.Session) {
         PQ_LOG_D("Partition " << Partition <<
             " Consumer '" << consumer << "'" <<
@@ -2611,9 +2601,6 @@ void TPartition::CommitTransaction(TSimpleSharedPtr<TTransaction>& t)
         Y_ABORT_UNLESS(t->Predicate.Defined() && *t->Predicate);
 
         for (auto& operation : t->Tx->Operations) {
-
-            Cerr << ">>>>> CommitTransaction " << Endl << Flush;
-
             if (operation.GetOnlyCheckCommitedToFinish()) {
                 continue;
             }
@@ -2942,7 +2929,7 @@ TPartition::EProcessResult TPartition::PreProcessImmediateTx(const NKikimrPQ::TE
             return EProcessResult::ContinueDrop;
         }
 
-        auto [r, _] = ValidatePartitionOperation(operation);
+        auto [r, real] = ValidatePartitionOperation(operation);
         if (!r) {
             ScheduleReplyPropose(tx,
                 NKikimrPQ::TEvProposeTransactionResult::BAD_REQUEST,
@@ -2951,7 +2938,9 @@ TPartition::EProcessResult TPartition::PreProcessImmediateTx(const NKikimrPQ::TE
             return EProcessResult::ContinueDrop;
         }
 
-        consumers.insert(user);
+        if (real) {
+            consumers.insert(user);
+        }
     }
     SetOffsetAffectedConsumers.insert(consumers.begin(), consumers.end());
     WriteKeysSizeEstimate += consumers.size();
@@ -2975,6 +2964,10 @@ void TPartition::ExecImmediateTx(TTransaction& t)
         return;
     }
     for (const auto& operation : record.GetData().GetOperations()) {
+        if (operation.GetOnlyCheckCommitedToFinish()) {
+            continue;
+        }
+
         if (!operation.HasCommitOffsetsBegin() || !operation.HasCommitOffsetsEnd() || !operation.HasConsumer()) {
             continue; //Write operation - handled separately via WriteInfo
         }

ydb/core/persqueue/ut/ut_with_sdk/commitoffset_ut.cpp

@@ -207,7 +207,7 @@ Y_UNIT_TEST_SUITE(CommitOffset) {
         }
     }
 
-    Y_UNIT_TEST(Commit_WithSession_ParentNotFinished) {
+    Y_UNIT_TEST(Commit_WithSession_ParentNotFinished_SameSession) {
         TTopicSdkTestSetup setup = CreateSetup();
         PrepareAutopartitionedTopic(setup);
 
@@ -224,8 +224,8 @@ Y_UNIT_TEST_SUITE(CommitOffset) {
         }
 
         {
-            auto r = setup.Read(TEST_TOPIC, TEST_CONSUMER, [&](auto&) {
-                return false;
+            auto r = setup.Read(TEST_TOPIC, TEST_CONSUMER, [&](auto& x) {
+                return x.GetMessages().back().GetData() != "message-3-3";
             });
 
             // Commit parent to middle
@@ -240,6 +240,32 @@ Y_UNIT_TEST_SUITE(CommitOffset) {
         }
     }
 
+    Y_UNIT_TEST(Commit_WithSession_ParentNotFinished_OtherSession) {
+        TTopicSdkTestSetup setup = CreateSetup();
+        PrepareAutopartitionedTopic(setup);
+        TTopicClient client(setup.MakeDriver());
+
+        auto createReadSession = [&](size_t partitionId) {
+            return client.CreateReadSession(
+                TReadSessionSettings()
+                    .AutoPartitioningSupport(true)
+                    .AppendTopics(TTopicReadSettings(TEST_TOPIC).AppendPartitionIds(partitionId))
+                    .ConsumerName(TEST_CONSUMER));
+        };
+
+        auto session0 = createReadSession(0);
+        auto session1 = createReadSession(1);
+
+        auto result = setup.Commit(TEST_TOPIC, TEST_CONSUMER, 1, 1, session1->GetSessionId());
+        UNIT_ASSERT(!result.IsSuccess());
+
+        UNIT_ASSERT_VALUES_EQUAL(0, GetCommittedOffset(setup, 0));
+        UNIT_ASSERT_VALUES_EQUAL(0, GetCommittedOffset(setup, 1));
+        UNIT_ASSERT_VALUES_EQUAL(0, GetCommittedOffset(setup, 2));
+        UNIT_ASSERT_VALUES_EQUAL(0, GetCommittedOffset(setup, 3));
+        UNIT_ASSERT_VALUES_EQUAL(0, GetCommittedOffset(setup, 4));
+    }
+
     Y_UNIT_TEST(Commit_WithSession_ToPastParentPartition) {
         TTopicSdkTestSetup setup = CreateSetup();
         PrepareAutopartitionedTopic(setup);