Fix distconf startup bug (#7094)

3 files changed, 7 insertions, 4 deletions

diff --git a/ydb/core/blobstorage/nodewarden/distconf.cpp b/ydb/core/blobstorage/nodewarden/distconf.cpp
index 84ad8a34399..4ae279067e8 100644
--- a/ydb/core/blobstorage/nodewarden/distconf.cpp
+++ b/ydb/core/blobstorage/nodewarden/distconf.cpp
@@ -197,7 +197,7 @@ namespace NKikimr::NStorage {
         switch (ev->GetTypeRewrite()) {
             case TEvInterconnect::TEvNodesInfo::EventType:
                 Handle(reinterpret_cast<TEvInterconnect::TEvNodesInfo::TPtr&>(ev));
-                if (!NodeIds.empty()) {
+                if (!NodeIds.empty() || !IsSelfStatic) {
                     change = !std::exchange(NodeListObtained, true);
                 }
                 break;
@@ -220,6 +220,10 @@ namespace NKikimr::NStorage {
         }
 
         if (change && NodeListObtained && StorageConfigLoaded) {
+            if (IsSelfStatic) {
+                UpdateBound(SelfNode.NodeId(), SelfNode, *StorageConfig, nullptr);
+                IssueNextBindRequest();
+            }
             processPendingEvents();
         }
     }
diff --git a/ydb/core/blobstorage/nodewarden/distconf.h b/ydb/core/blobstorage/nodewarden/distconf.h
index 075288efcd9..723795409f3 100644
--- a/ydb/core/blobstorage/nodewarden/distconf.h
+++ b/ydb/core/blobstorage/nodewarden/distconf.h
@@ -220,7 +220,6 @@ namespace NKikimr::NStorage {
         std::deque<TAutoPtr<IEventHandle>> PendingEvents;
         std::vector<ui32> NodeIds;
         TNodeIdentifier SelfNode;
-        bool SelfBound = false;
 
         // scatter tasks
         ui64 NextScatterCookie = RandomNumber<ui64>();
diff --git a/ydb/core/blobstorage/nodewarden/distconf_binding.cpp b/ydb/core/blobstorage/nodewarden/distconf_binding.cpp
index ebce2c6383e..e804a67a98b 100644
--- a/ydb/core/blobstorage/nodewarden/distconf_binding.cpp
+++ b/ydb/core/blobstorage/nodewarden/distconf_binding.cpp
@@ -58,13 +58,13 @@ namespace NKikimr::NStorage {
         // issue updates
         NodeIds = std::move(nodeIds);
         BindQueue.Update(NodeIds);
-        if (NodeListObtained && StorageConfigLoaded && !std::exchange(SelfBound, true)) {
-            UpdateBound(SelfNode.NodeId(), SelfNode, *StorageConfig, nullptr);
+        if (NodeListObtained && StorageConfigLoaded) {
             IssueNextBindRequest();
         }
     }
 
     void TDistributedConfigKeeper::IssueNextBindRequest() {
+        Y_DEBUG_ABORT_UNLESS(IsSelfStatic);
         CheckRootNodeStatus();
         if (RootState == ERootState::INITIAL && !Binding && AllBoundNodes.size() < NodeIds.size()) {
             const TMonotonic now = TActivationContext::Monotonic();