Merge 7e19006 into 02fdbe3

Author: CyberROFL

ydb/core/tx/schemeshard/schemeshard_cdc_stream_scan.cpp

@@ -53,6 +53,7 @@ class TCdcStreamScanFinalizer: public TActorBootstrapped<TCdcStreamScanFinalizer
     void Handle(TEvTxUserProxy::TEvAllocateTxIdResult::TPtr& ev) {
         Request->Record.SetTxId(ev->Get()->TxId);
         Send(SSActorId, Request.Release());
+        TActorBootstrapped::PassAway();
     }
 
 private:
@@ -126,7 +127,7 @@ struct TSchemeShard::TCdcStreamScan::TTxProgress: public TTransactionBase<TSchem
         }
 
         if (Finalize) {
-            Self->CdcStreamScanFinalizer = ctx.Register(new TCdcStreamScanFinalizer(ctx.SelfID, std::move(Finalize)));
+            ctx.Register(new TCdcStreamScanFinalizer(ctx.SelfID, std::move(Finalize)));
         }
     }
 

ydb/core/tx/schemeshard/schemeshard_impl.cpp

@@ -4512,10 +4512,6 @@ void TSchemeShard::Die(const TActorContext &ctx) {
         ctx.Send(TabletMigrator, new TEvents::TEvPoisonPill());
     }
 
-    if (CdcStreamScanFinalizer) {
-        ctx.Send(CdcStreamScanFinalizer, new TEvents::TEvPoisonPill());
-    }
-
     IndexBuildPipes.Shutdown(ctx);
     CdcStreamScanPipes.Shutdown(ctx);
     ShardDeleter.Shutdown(ctx);

ydb/core/tx/schemeshard/schemeshard_impl.h

@@ -352,7 +352,6 @@ class TSchemeShard
 
     TActorId TabletMigrator;
 
-    TActorId CdcStreamScanFinalizer;
     ui32 MaxCdcInitialScanShardsInFlight = 10;
 
     TDuration StatsMaxExecuteTime;