cleanup whiteboard (#29291)

Author: adameat

ydb/core/blobstorage/nodewarden/node_warden_resource.cpp

@@ -150,12 +150,6 @@ void TNodeWarden::Handle(TEvNodeWardenStorageConfig::TPtr ev) {
             TAutoPtr<IEventHandle> temp(ev.Release());
             Receive(temp);
         }
-
-        using TEvBridgeInfoUpdate = NNodeWhiteboard::TEvWhiteboard::TEvBridgeInfoUpdate;
-        std::unique_ptr<TEvBridgeInfoUpdate> update(new TEvBridgeInfoUpdate);
-        update->Record.MutableClusterState()->CopyFrom(StorageConfig->GetClusterState());
-
-        Send(WhiteboardId, update.release());
     }
 }
 

ydb/core/grpc_services/rpc_cluster_state.cpp

@@ -21,6 +21,7 @@
 #include <ydb/public/api/protos/ydb_monitoring.pb.h>
 #include <ydb/core/protos/cluster_state_info.pb.h>
 #include <ydb/core/node_whiteboard/node_whiteboard.h>
+#include <ydb/core/blobstorage/base/blobstorage_events.h>
 #include <ydb/core/blobstorage/nodewarden/node_warden_events.h>
 #include <google/protobuf/util/json_util.h>
 
@@ -148,7 +149,6 @@ class TClusterStateRPC : public TRpcRequestActor<TClusterStateRPC, TEvClusterSta
         request(TEvTabletStateRequest);
         request(TEvBSGroupStateRequest);
         request(TEvSystemStateRequest);
-        request(TEvBridgeInfoRequest);
         request(TEvNodeStateRequest);
 #undef request
     }
@@ -157,6 +157,7 @@ class TClusterStateRPC : public TRpcRequestActor<TClusterStateRPC, TEvClusterSta
         RequestSession();
         RequestHealthCheck();
         RequestBaseConfig();
+        RequestStorageConfig();
         Nodes = ev->Get()->Nodes;
         NodeReceived.resize(Nodes.size());
         NodeRequested.resize(Nodes.size());
@@ -243,12 +244,24 @@ class TClusterStateRPC : public TRpcRequestActor<TClusterStateRPC, TEvClusterSta
         Requested++;
     }
 
+    void RequestStorageConfig() {
+        Send(MakeBlobStorageNodeWardenID(SelfId().NodeId()), new NKikimr::TEvNodeWardenQueryStorageConfig(/*subscribe=*/false));
+        Requested++;
+    }
+
     void Handle(NKikimr::NStorage::TEvNodeWardenBaseConfig::TPtr ev) {
         State.MutableBaseConfig()->CopyFrom(ev->Get()->BaseConfig);
         ++Received;
         CheckReply();
     }
 
+    void Handle(NKikimr::TEvNodeWardenStorageConfig::TPtr ev) {
+        State.MutableBridgeClusterState()->CopyFrom(ev->Get()->Config->GetClusterState());
+        State.MutableBridgeClusterStateDetails()->CopyFrom(ev->Get()->Config->GetClusterStateDetails());
+        ++Received;
+        CheckReply();
+    }
+
     void Disconnected(TEvInterconnect::TEvNodeDisconnected::TPtr &ev) {
         ui32 nodeId = ev->Get()->NodeId;
         for (ui32 i : xrange(Nodes.size())) {
@@ -272,7 +285,6 @@ class TClusterStateRPC : public TRpcRequestActor<TClusterStateRPC, TEvClusterSta
     HandleWhiteboard(TEvTabletStateResponse, TabletInfo)
     HandleWhiteboard(TEvBSGroupStateResponse, BSGroupInfo)
     HandleWhiteboard(TEvSystemStateResponse, SystemInfo)
-    HandleWhiteboard(TEvBridgeInfoResponse, BridgeInfo)
     HandleWhiteboard(TEvNodeStateResponse, NodeStateInfo)
 
     void Handle(NKikimr::NCountersInfo::TEvCountersInfoResponse::TPtr& ev) {
@@ -359,11 +371,11 @@ class TClusterStateRPC : public TRpcRequestActor<TClusterStateRPC, TEvClusterSta
             hFunc(NNodeWhiteboard::TEvWhiteboard::TEvTabletStateResponse, Handle);
             hFunc(NNodeWhiteboard::TEvWhiteboard::TEvBSGroupStateResponse, Handle);
             hFunc(NNodeWhiteboard::TEvWhiteboard::TEvSystemStateResponse, Handle);
-            hFunc(NNodeWhiteboard::TEvWhiteboard::TEvBridgeInfoResponse, Handle);
             hFunc(NNodeWhiteboard::TEvWhiteboard::TEvNodeStateResponse, Handle);
             hFunc(NKqp::TEvKqp::TEvCreateSessionResponse, Handle);
             hFunc(NKqp::TEvKqp::TEvQueryResponse, Handle)
             hFunc(NKikimr::NStorage::TEvNodeWardenBaseConfig, Handle);
+            hFunc(NKikimr::TEvNodeWardenStorageConfig, Handle);
             hFunc(NKikimr::NCountersInfo::TEvCountersInfoResponse, Handle);
             hFunc(TEvInterconnect::TEvNodeDisconnected, Disconnected);
             cFunc(TEvents::TSystem::Wakeup, Wakeup);

ydb/core/node_whiteboard/node_whiteboard.h

@@ -16,9 +16,7 @@
 #include <ydb/core/base/tracing.h>
 #include <ydb/core/protos/blobstorage_vdisk_config.pb.h>
 
-namespace NKikimr {
-
-namespace NNodeWhiteboard {
+namespace NKikimr::NNodeWhiteboard {
 
 using TTabletId = ui64;
 using TFollowerId = ui32;
@@ -480,10 +478,6 @@ struct TEvWhiteboard {
 
     struct TEvSignalBodyRequest : TEventPB<TEvSignalBodyRequest, NKikimrWhiteboard::TEvSignalBodyRequest, EvSignalBodyRequest> {};
     struct TEvSignalBodyResponse : TEventPB<TEvSignalBodyResponse, NKikimrWhiteboard::TEvSignalBodyResponse, EvSignalBodyResponse> {};
-
-    struct TEvBridgeInfoUpdate : public TEventPB<TEvBridgeInfoUpdate, NKikimrWhiteboard::TBridgeInfo, EvBridgeInfoUpdate> {};
-    struct TEvBridgeInfoRequest : public TEventPB<TEvBridgeInfoRequest, NKikimrWhiteboard::TEvBridgeInfoRequest, EvBridgeInfoRequest> {};
-    struct TEvBridgeInfoResponse : public TEventPB<TEvBridgeInfoResponse, NKikimrWhiteboard::TEvBridgeInfoResponse, EvBridgeInfoResponse> {};
 };
 
 inline TActorId MakeNodeWhiteboardServiceId(ui32 node) {
@@ -529,5 +523,4 @@ struct WhiteboardResponse<TEvWhiteboard::TEvNodeStateRequest> {
 template<typename TResponseType>
 ::google::protobuf::RepeatedField<int> GetDefaultWhiteboardFields();
 
-} // NNodeWhiteboard
-} // NKikimr
+} // NKikimr::NNodeWhiteboard

ydb/core/protos/cluster_state_info.proto

@@ -1,5 +1,6 @@
 import "ydb/core/protos/blobstorage_config.proto";
 import "ydb/core/protos/kqp.proto";
+import "ydb/core/protos/bridge.proto";
 import "ydb/core/protos/node_whiteboard.proto";
 import "ydb/public/api/protos/ydb_monitoring.proto";
 
@@ -16,7 +17,6 @@ message TNodeInfo {
     optional NKikimrWhiteboard.TEvTabletStateResponse TabletInfo = 7;
     optional NKikimrWhiteboard.TEvBSGroupStateResponse BSGroupInfo = 8;
     optional NKikimrWhiteboard.TEvSystemStateResponse SystemInfo = 9;
-    optional NKikimrWhiteboard.TEvBridgeInfoResponse BridgeInfo = 10;
     optional NKikimrWhiteboard.TEvNodeStateResponse NodeStateInfo = 11;
     repeated string CountersInfo = 12;
 }
@@ -38,4 +38,6 @@ message TClusterStateInfo {
     repeated TNodeInfo NodeInfos = 2;
     optional NKikimrBlobStorage.TBaseConfig BaseConfig = 3;
     repeated TClusterStateQueryInfo Queries = 4;
+    optional NKikimrBridge.TClusterState BridgeClusterState = 5;
+    optional NKikimrBridge.TClusterStateDetails BridgeClusterStateDetails = 6;
 }

ydb/core/protos/node_whiteboard.proto

@@ -5,7 +5,6 @@ import "ydb/core/protos/blobstorage_disk.proto";
 import "ydb/core/protos/whiteboard_disk_states.proto";
 import "ydb/core/protos/whiteboard_flags.proto";
 import "ydb/core/protos/memory_stats.proto";
-import "ydb/core/protos/bridge.proto";
 import "google/protobuf/descriptor.proto";
 import "ydb/core/protos/tracing.proto";
 import "ydb/core/protos/blobstorage_disk_color.proto";
@@ -427,25 +426,3 @@ message TEvSignalBodyRequest {
 message TEvSignalBodyResponse {
     optional string SignalBody = 1;
 }
-
-message TBridgeInfo {
-    optional NKikimrBridge.TClusterState ClusterState = 1;
-}
-
-message TBridgeNodesInfo {
-    message TPileInfo {
-        repeated uint32 NodeIds = 1;
-    }
-    repeated TPileInfo Piles = 1;
-}
-
-message TEvBridgeInfoRequest {
-    optional uint64 ChangedSince = 1;
-}
-
-message TEvBridgeInfoResponse {
-    optional bool IsBridgeCluster = 1;
-    optional TBridgeInfo BridgeInfo = 2;
-    optional TBridgeNodesInfo BridgeNodesInfo = 3;
-    optional uint64 ResponseTime = 4;
-}