Merge 65bf25e into f754a3e

Author: ivanmorozov333

ydb/core/tx/columnshard/columnshard__write.cpp

@@ -315,18 +315,20 @@ class TCommitOperation {
         LockId = lock.GetLockId();
         SendingShards = std::set<ui64>(locks.GetSendingShards().begin(), locks.GetSendingShards().end());
         ReceivingShards = std::set<ui64>(locks.GetReceivingShards().begin(), locks.GetReceivingShards().end());
-        const bool singleShardTx = SendingShards.empty() && ReceivingShards.empty();
-        if (!singleShardTx) {
+        if (SendingShards.empty() != ReceivingShards.empty()) {
+            return TConclusionStatus::Fail("incorrect synchronization data (send/receiving lists)");
+        }
+        if (ReceivingShards.size() && SendingShards.size()) {
             if (!ReceivingShards.contains(TabletId) && !SendingShards.contains(TabletId)) {
-                return TConclusionStatus::Fail("shard is absent in sending and receiving lists");
+                return TConclusionStatus::Fail("current tablet_id is absent in sending and receiving lists");
             }
-            if (locks.HasArbiterColumnShard()) {
-                ArbiterColumnShard = locks.GetArbiterColumnShard();
-            } else {
-                AFL_VERIFY(!ReceivingShards.empty());
-                ArbiterColumnShard = *ReceivingShards.begin();
+            if (!locks.HasArbiterColumnShard()) {
+                return TConclusionStatus::Fail("no arbiter info in request");
+            }
+            ArbiterColumnShard = locks.GetArbiterColumnShard();
+            if (!ReceivingShards.contains(ArbiterColumnShard)) {
+                return TConclusionStatus::Fail("arbiter is absent in receiving lists: " + ::ToString(ArbiterColumnShard) + " in [" + JoinSeq(", ", ReceivingShards) + "]");
             }
-            AFL_VERIFY(ArbiterColumnShard);
         }
 
         Generation = lock.GetGeneration();

ydb/core/tx/columnshard/transactions/operators/ev_write/primary.h

@@ -159,7 +159,8 @@ class TEvWriteCommitPrimaryTransactionOperator: public TEvWriteCommitSyncTransac
     };
 
     virtual bool IsTxBroken() const override {
-        return TxBroken.value_or(false);
+        AFL_VERIFY(TxBroken);
+        return *TxBroken;
     }
 
     void InitializeRequests(TColumnShard& owner) {