Merge 7ce8a4a into 2876ba4

Author: ivanmorozov333

ydb/core/tx/columnshard/columnshard__write.cpp

@@ -313,19 +313,21 @@ class TCommitOperation {
         auto& lock = evWrite.Record.GetLocks().GetLocks()[0];
         SendingShards = std::set<ui64>(locks.GetSendingShards().begin(), locks.GetSendingShards().end());
         ReceivingShards = std::set<ui64>(locks.GetReceivingShards().begin(), locks.GetReceivingShards().end());
-        if (!ReceivingShards.size() || !SendingShards.size()) {
-            ReceivingShards.clear();
-            SendingShards.clear();
-        } else if (!locks.HasArbiterColumnShard()) {
-            ArbiterColumnShard = *ReceivingShards.begin();
-            if (!ReceivingShards.contains(TabletId) && !SendingShards.contains(TabletId)) {
-                return TConclusionStatus::Fail("shard is incorrect for sending/receiving lists");
-            }
-        } else {
-            ArbiterColumnShard = locks.GetArbiterColumnShard();
-            AFL_VERIFY(ArbiterColumnShard);
-            if (!ReceivingShards.contains(TabletId) && !SendingShards.contains(TabletId)) {
-                return TConclusionStatus::Fail("shard is incorrect for sending/receiving lists");
+        if (SendingShards.empty() != ReceivingShards.empty()) {
+            return TConclusionStatus::Fail("incorrect synchronization data (send/receiving lists)");
+        }
+        if (ReceivingShards.size() && SendingShards.size()) {
+            if (!locks.HasArbiterColumnShard()) {
+                ArbiterColumnShard = *ReceivingShards.begin();
+                if (!ReceivingShards.contains(TabletId) && !SendingShards.contains(TabletId)) {
+                    return TConclusionStatus::Fail("shard is incorrect for sending/receiving lists");
+                }
+            } else {
+                ArbiterColumnShard = locks.GetArbiterColumnShard();
+                AFL_VERIFY(ArbiterColumnShard);
+                if (!ReceivingShards.contains(TabletId) && !SendingShards.contains(TabletId)) {
+                    return TConclusionStatus::Fail("shard is incorrect for sending/receiving lists");
+                }
             }
         }