Merge d3b3bb2 into 635f97b

Author: ivanmorozov333

ydb/core/tx/columnshard/columnshard__propose_transaction.cpp

@@ -20,6 +20,7 @@ class TTxProposeTransaction : public NTabletFlatExecutor::TTransactionBase<TColu
     }
 
     virtual bool Execute(TTransactionContext& txc, const TActorContext& ctx) override {
+        NActors::TLogContextGuard lGuard = NActors::TLogContextBuilder::Build()("tablet_id", Self->TabletID())("tx_id", txId)("this", (ui64)this);
         txc.DB.NoMoreReadsForTx();
         NIceDb::TNiceDb db(txc.DB);
 
@@ -61,6 +62,7 @@ class TTxProposeTransaction : public NTabletFlatExecutor::TTransactionBase<TColu
     }
 
     virtual void Complete(const TActorContext& ctx) override {
+        NActors::TLogContextGuard lGuard = NActors::TLogContextBuilder::Build()("tablet_id", Self->TabletID())("tx_id", txId)("this", (ui64)this);
         auto& record = Proto(Ev->Get());
         if (record.GetTxKind() == NKikimrTxColumnShard::TX_KIND_TTL) {
             return;

ydb/core/tx/columnshard/transactions/operators/backup.h

@@ -27,6 +27,10 @@ class TBackupTransactionOperator: public IProposeTxOperator {
         return true;
     }
     virtual bool DoParse(TColumnShard& owner, const TString& data) override;
+    virtual TString DoDebugString() const override {
+        return "BACKUP";
+    }
+
 public:
     using TBase::TBase;
 

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

@@ -26,6 +26,9 @@ namespace NKikimr::NColumnShard {
         virtual bool DoCheckAllowUpdate(const TFullTxInfo& currentTxInfo) const override {
             return (currentTxInfo.Source == GetTxInfo().Source && currentTxInfo.Cookie == GetTxInfo().Cookie);
         }
+        virtual TString DoDebugString() const override {
+            return "EV_WRITE";
+        }
         virtual void DoSendReply(TColumnShard& owner, const TActorContext& ctx) override {
             const auto& txInfo = GetTxInfo();
             std::unique_ptr<NActors::IEventBase> evResult;

ydb/core/tx/columnshard/transactions/operators/long_tx_write.h

@@ -12,6 +12,10 @@ namespace NKikimr::NColumnShard {
         static inline auto Registrator = TFactory::TRegistrator<TLongTxTransactionOperator>(NKikimrTxColumnShard::TX_KIND_COMMIT);
 
     private:
+        virtual TString DoDebugString() const override {
+            return "LONG_TX_WRITE";
+        }
+
         virtual TProposeResult DoStartProposeOnExecute(TColumnShard& owner, NTabletFlatExecutor::TTransactionContext& txc) override;
         virtual void DoStartProposeOnComplete(TColumnShard& /*owner*/, const TActorContext& /*ctx*/) override {
 

ydb/core/tx/columnshard/transactions/operators/schema.h

@@ -101,6 +101,9 @@ namespace NKikimr::NColumnShard {
             }
             return ValidateTableSchema(preset.GetSchema());
         }
+        virtual TString DoDebugString() const override {
+            return "SCHEME:" + SchemaTxBody.DebugString();
+        }
 
     private:
         NKikimrTxColumnShard::TSchemaTxBody SchemaTxBody;

ydb/core/tx/columnshard/transactions/operators/sharing.h

@@ -28,6 +28,10 @@ class TSharingTransactionOperator: public IProposeTxOperator {
         return true;
     }
     virtual bool DoParse(TColumnShard& owner, const TString& data) override;
+    virtual TString DoDebugString() const override {
+        return "SHARING";
+    }
+
 public:
     using TBase::TBase;
     virtual void RegisterSubscriber(const TActorId& actorId) override {

ydb/core/tx/columnshard/transactions/tx_controller.cpp

@@ -360,7 +360,7 @@ void TTxController::FinishProposeOnComplete(const ui64 txId, const TActorContext
 }
 
 void TTxController::ITransactionOperator::SwitchStateVerified(const EStatus from, const EStatus to) {
-    AFL_VERIFY(!Status || *Status == from)("error", "incorrect expected status")("real_state", *Status)("expected", from);
+    AFL_VERIFY(!Status || *Status == from)("error", "incorrect expected status")("real_state", *Status)("expected", from)("details", DebugString());
     Status = to;
 }
 

ydb/core/tx/columnshard/transactions/tx_controller.h

@@ -187,10 +187,16 @@ class TTxController {
             Status = {};
         }
 
+        virtual TString DoDebugString() const = 0;
+
     public:
         using TPtr = std::shared_ptr<ITransactionOperator>;
         using TFactory = NObjectFactory::TParametrizedObjectFactory<ITransactionOperator, NKikimrTxColumnShard::ETransactionKind, TTxInfo>;
 
+        TString DebugString() const {
+            return DoDebugString();
+        }
+
         bool CheckAllowUpdate(const TFullTxInfo& currentTxInfo) const {
             return DoCheckAllowUpdate(currentTxInfo);
         }