Merge c37ee9f into 1277454

Author: nshestakov

ydb/core/persqueue/ut/partition_chooser_ut.cpp

@@ -621,6 +621,19 @@ Y_UNIT_TEST(TPartitionChooserActor_SplitMergeEnabled_PreferedPartition_OtherPart
     AssertTable(server, "A_Source_10", 0, 13);
 }
 
+Y_UNIT_TEST(TPartitionChooserActor_SplitMergeEnabled_BadSourceId_Test) {
+    NPersQueue::TTestServer server = CreateServer();
+
+    auto config = CreateConfig0(true);
+    AddPartition(config, 0, {}, {});
+    CreatePQTabletMock(server, 0, ETopicPartitionStatus::Active);
+
+    auto r = ChoosePartition(server, config, "base64:a***");
+
+    UNIT_ASSERT(r->Error);
+}
+
+
 Y_UNIT_TEST(TPartitionChooserActor_SplitMergeDisabled_NewSourceId_Test) {
     NPersQueue::TTestServer server = CreateServer();
 
@@ -692,4 +705,16 @@ Y_UNIT_TEST(TPartitionChooserActor_SplitMergeDisabled_PreferedPartition_Inactive
     UNIT_ASSERT(r->Error);
 }
 
+Y_UNIT_TEST(TPartitionChooserActor_SplitMergeDisabled_BadSourceId_Test) {
+    NPersQueue::TTestServer server = CreateServer();
+
+    auto config = CreateConfig0(false);
+    AddPartition(config, 0, {}, {});
+
+    auto r = ChoosePartition(server, config, "base64:a***");
+
+    UNIT_ASSERT(r->Error);
+}
+
+
 }

ydb/core/persqueue/writer/partition_chooser_impl__abstract_chooser_actor.h

@@ -54,8 +54,12 @@ class TAbstractPartitionChooserActor: public TActorBootstrapped<TDerived> {
         return TActor<TDerived>::SelfId();
     }
 
-    void Initialize(const NActors::TActorContext& ctx) {
-        TableHelper.Initialize(ctx, SourceId);
+    [[nodiscard]] bool Initialize(const NActors::TActorContext& ctx) {
+        if (TableHelper.Initialize(ctx, SourceId)) {
+            return true;
+        }
+        TThis::ReplyError(ErrorCode::BAD_REQUEST, "Bad SourceId", ctx);
+        return false;
     }
 
     void PassAway() {

ydb/core/persqueue/writer/partition_chooser_impl__old_chooser_actor.h

@@ -37,7 +37,9 @@ class TPartitionChooserActor: public TAbstractPartitionChooserActor<TPartitionCh
     }
 
     void Bootstrap(const TActorContext& ctx) {
-        TThis::Initialize(ctx);
+        if (!TThis::Initialize(ctx)) {
+            return;
+        }
         TThis::InitTable(ctx);
     }
 

ydb/core/persqueue/writer/partition_chooser_impl__sm_chooser_actor.h

@@ -38,7 +38,9 @@ class TSMPartitionChooserActor: public TAbstractPartitionChooserActor<TSMPartiti
     }
 
     void Bootstrap(const TActorContext& ctx) {
-        TThis::Initialize(ctx);
+        if (!TThis::Initialize(ctx)) {
+            return;
+        }
         BoundaryPartition = ChoosePartitionSync();
 
         if (TThis::SourceId) {

ydb/core/persqueue/writer/partition_chooser_impl__table_helper.h

@@ -40,7 +40,7 @@ class TTableHelper {
         return SeqNo_;
     }
 
-    bool Initialize(const TActorContext& ctx, const TString& sourceId) {
+    [[nodiscard]] bool Initialize(const TActorContext& ctx, const TString& sourceId) {
         const auto& pqConfig = AppData(ctx)->PQConfig;
 
         TableGeneration = pqConfig.GetTopicsAreFirstClassCitizen() ? ESourceIdTableGeneration::PartitionMapping