more correct way to check for bridge mode in local & hive (#20210)

Co-authored-by: Ilnaz Nizametdinov <i.nizametdinov@gmail.com>

Author: vporyadke

ydb/core/base/bridge.cpp

@@ -0,0 +1,12 @@
+#include "bridge.h"
+
+#include <ydb/core/protos/config.pb.h>
+
+namespace NKikimr {
+
+bool IsBridgeMode(const TActorContext &ctx) {
+    const auto *bridgeConfig = AppData(ctx)->BridgeConfig;
+    return bridgeConfig && bridgeConfig->PilesSize() > 0;
+}
+
+} // NKikimr

ydb/core/base/bridge.h

@@ -1,5 +1,6 @@
 #pragma once
 
+#include "appdata_fwd.h"
 #include "defs.h"
 #include "blobstorage_common.h"
 
@@ -46,4 +47,6 @@ namespace NKikimr {
         }
     };
 
+    bool IsBridgeMode(const TActorContext &ctx);
+
 } // NKikimr

ydb/core/base/ya.make

@@ -11,6 +11,8 @@ SRCS(
     board_lookup.cpp
     board_publish.cpp
     board_replica.cpp
+    bridge.h
+    bridge.cpp
     blobstorage.h
     blobstorage.cpp
     blobstorage_grouptype.cpp

ydb/core/mind/hive/hive_impl.cpp

@@ -722,7 +722,7 @@ void THive::Cleanup() {
 }
 
 void THive::MaybeLoadEverything() {
-    if (!NodesInfo.empty() && HaveStorageConfig && CurrentStateFunc() == &TThis::StateInit) {
+    if (!NodesInfo.empty() && (!IsBridgeMode(TActivationContext::AsActorContext()) || BridgeInfo)) {
         Execute(CreateLoadEverything());
     }
 }
@@ -3599,7 +3599,6 @@ void THive::Handle(TEvPrivate::TEvUpdateFollowers::TPtr&) {
 void THive::Handle(TEvNodeWardenStorageConfig::TPtr& ev) {
     BLOG_D("Handle TEvNodeWardenStorageConfig");
     BridgeInfo = ev->Get()->BridgeInfo;
-    HaveStorageConfig = true;
     MaybeLoadEverything();
 }
 

ydb/core/mind/hive/hive_impl.h

@@ -397,7 +397,6 @@ class THive : public TActor<THive>, public TTabletExecutedFlat, public THiveShar
     i32 MigrationProgress = 0;
     NKikimrHive::TEvSeizeTablets MigrationFilter;
     TBridgeInfo::TPtr BridgeInfo;
-    bool HaveStorageConfig = false;
 
     TActorId ResponsivenessActorID;
     TTabletResponsivenessPinger *ResponsivenessPinger;

ydb/core/mind/hive/tx__init_scheme.cpp

@@ -97,8 +97,10 @@ class TTxInitScheme : public TTransactionBase<THive> {
         BLOG_D("THive::TTxInitScheme::Complete");
         const TActorId nameserviceId = GetNameserviceActorId();
         ctx.Send(nameserviceId, new TEvInterconnect::TEvListNodes());
-        const TActorId wardenId = MakeBlobStorageNodeWardenID(ctx.SelfID.NodeId());
-        ctx.Send(wardenId, new TEvNodeWardenQueryStorageConfig(true));
+        if (IsBridgeMode(ctx)) {
+            const TActorId wardenId = MakeBlobStorageNodeWardenID(ctx.SelfID.NodeId());
+            ctx.Send(wardenId, new TEvNodeWardenQueryStorageConfig(true));
+        }
     }
 };
 

ydb/core/mind/local.cpp

@@ -937,11 +937,13 @@ class TLocalNodeRegistrar : public TActorBootstrapped<TLocalNodeRegistrar> {
 
     void Handle(TEvNodeWardenStorageConfig::TPtr &ev, const TActorContext &ctx) {
         auto bridgeInfo = ev->Get()->BridgeInfo;
-        if (bridgeInfo) {
-            auto pileInfo = bridgeInfo->SelfNodePile;
-            if (pileInfo) {
-                BridgePileId = pileInfo->BridgePileId;
-            }
+        if (bridgeInfo == nullptr) {
+            // There will be an update with bridge info later
+            return;
+        }
+        auto pileInfo = bridgeInfo->SelfNodePile;
+        if (pileInfo) {
+            BridgePileId = pileInfo->BridgePileId;
         }
         TryToRegister(ctx);
         if (LastDrainRequest) {
@@ -1005,8 +1007,14 @@ class TLocalNodeRegistrar : public TActorBootstrapped<TLocalNodeRegistrar> {
         LOG_DEBUG(ctx, NKikimrServices::LOCAL, "TLocalNodeRegistrar::Bootstrap");
         StartTime = ctx.Now();
         const TActorId wardenId = MakeBlobStorageNodeWardenID(SelfId().NodeId());
-        Send(wardenId, new TEvNodeWardenQueryStorageConfig(true));
-        Become(&TThis::StateInit);
+        if (IsBridgeMode(ctx)) {
+            Send(wardenId, new TEvNodeWardenQueryStorageConfig(true));
+            Become(&TThis::StateInit);
+        } else {
+            TryToRegister(ctx);
+            Send(SelfId(), new TEvPrivate::TEvUpdateSystemUsage());
+            Become(&TThis::StateWork);
+        }
     }
 
     STFUNC(StateWork) {