KIKIMR-18796: small fixes and prevent guard alert on actors cleaning

2 files changed, 9 insertions, 4 deletions

diff --git a/ydb/core/tx/columnshard/engines/index_logic_logs.h b/ydb/core/tx/columnshard/engines/index_logic_logs.h
index 7fe89b92e8c..3b13506a5da 100644
--- a/ydb/core/tx/columnshard/engines/index_logic_logs.h
+++ b/ydb/core/tx/columnshard/engines/index_logic_logs.h
@@ -39,10 +39,10 @@ public:
             }
             Counters.CompactionInputSize(readBytes);
         }
-        const TInstant start = TInstant::Now();
+        const TMonotonic start = TMonotonic::Now();
         TConclusion<std::vector<TString>> result = DoApply(indexChanges);
         if (result.IsSuccess()) {
-            Counters.CompactionDuration->Collect((TInstant::Now() - start).MilliSeconds());
+            Counters.CompactionDuration->Collect((TMonotonic::Now() - start).MilliSeconds());
         } else {
             Counters.CompactionFails->Add(1);
         }
diff --git a/ydb/core/tx/columnshard/engines/writer/compacted_blob_constructor.h b/ydb/core/tx/columnshard/engines/writer/compacted_blob_constructor.h
index eff8b3a86ba..08d22b7c2ca 100644
--- a/ydb/core/tx/columnshard/engines/writer/compacted_blob_constructor.h
+++ b/ydb/core/tx/columnshard/engines/writer/compacted_blob_constructor.h
@@ -46,10 +46,15 @@ private:
     TAutoPtr<NColumnShard::TEvPrivate::TEvWriteIndex> WriteIndexEv;
     std::shared_ptr<TBlobsConstructor> BlobConstructor;
     TActorId DstActor;
+protected:
+    void DoOnReadyResult(const NActors::TActorContext& ctx, const NColumnShard::TBlobPutResult::TPtr& putResult) override;
 public:
     TCompactedWriteController(const TActorId& dstActor, TAutoPtr<NColumnShard::TEvPrivate::TEvWriteIndex> writeEv, bool blobGrouppingEnabled);
-
-    void DoOnReadyResult(const NActors::TActorContext& ctx, const NColumnShard::TBlobPutResult::TPtr& putResult) override;
+    ~TCompactedWriteController() {
+        if (WriteIndexEv && WriteIndexEv->IndexChanges) {
+            WriteIndexEv->IndexChanges->AbortEmergency();
+        }
+    }
 
     NOlap::IBlobConstructor::TPtr GetBlobConstructor() override {
         return BlobConstructor;