Fix TReplicationWithRebootsTests::CreateDropRecreate() KIKIMR-19675

4 files changed, 9 insertions, 6 deletions

diff --git a/ydb/core/tx/replication/controller/replication.cpp b/ydb/core/tx/replication/controller/replication.cpp
index 420c9211b7..c52f970c60 100644
--- a/ydb/core/tx/replication/controller/replication.cpp
+++ b/ydb/core/tx/replication/controller/replication.cpp
@@ -129,8 +129,8 @@ public:
             target->Shutdown(ctx);
         }
 
-        for (auto& x : TVector<TActorId>{TargetDiscoverer, TenantResolver, YdbProxy}) {
-            if (auto actorId = std::exchange(x, {})) {
+        for (auto* x : TVector<TActorId*>{&TargetDiscoverer, &TenantResolver, &YdbProxy}) {
+            if (auto actorId = std::exchange(*x, {})) {
                 ctx.Send(actorId, new TEvents::TEvPoison());
             }
         }
diff --git a/ydb/core/tx/replication/controller/target_base.cpp b/ydb/core/tx/replication/controller/target_base.cpp
index e59cdf9cb0..ba0c19418c 100644
--- a/ydb/core/tx/replication/controller/target_base.cpp
+++ b/ydb/core/tx/replication/controller/target_base.cpp
@@ -105,8 +105,8 @@ void TTargetBase::Progress(ui64 schemeShardId, const TActorId& proxy, const TAct
 }
 
 void TTargetBase::Shutdown(const TActorContext& ctx) {
-    for (auto& x : TVector<TActorId>{DstCreator, DstRemover}) {
-        if (auto actorId = std::exchange(x, {})) {
+    for (auto* x : TVector<TActorId*>{&DstCreator, &DstRemover}) {
+        if (auto actorId = std::exchange(*x, {})) {
             ctx.Send(actorId, new TEvents::TEvPoison());
         }
     }
diff --git a/ydb/core/tx/replication/controller/target_with_stream.cpp b/ydb/core/tx/replication/controller/target_with_stream.cpp
index 6f1fbf1595..6a2af29641 100644
--- a/ydb/core/tx/replication/controller/target_with_stream.cpp
+++ b/ydb/core/tx/replication/controller/target_with_stream.cpp
@@ -36,8 +36,8 @@ void TTargetWithStream::Progress(ui64 schemeShardId, const TActorId& proxy, cons
 }
 
 void TTargetWithStream::Shutdown(const TActorContext& ctx) {
-    for (auto& x : TVector<TActorId>{StreamCreator, StreamRemover}) {
-        if (auto actorId = std::exchange(x, {})) {
+    for (auto* x : TVector<TActorId*>{&StreamCreator, &StreamRemover}) {
+        if (auto actorId = std::exchange(*x, {})) {
             ctx.Send(actorId, new TEvents::TEvPoison());
         }
     }
diff --git a/ydb/core/tx/schemeshard/schemeshard_path_describer.cpp b/ydb/core/tx/schemeshard/schemeshard_path_describer.cpp
index 744cae8be8..333b3e81c4 100644
--- a/ydb/core/tx/schemeshard/schemeshard_path_describer.cpp
+++ b/ydb/core/tx/schemeshard/schemeshard_path_describer.cpp
@@ -867,6 +867,9 @@ static bool ConsiderAsDropped(const TPath& path) {
     if (path.IsCdcStream()) {
         return false;
     }
+    if (path.IsReplication()) {
+        return false;
+    }
 
     return true;
 }