add database parameter to viewer/tabletinfo handler (ydb-platform#7499)

Author: adameat

ydb/core/viewer/json_wb_req.cpp

@@ -136,6 +136,11 @@ void InitViewerTabletInfoJsonHandler(TJsonHandlers& jsonHandlers) {
         .Summary = "Tablet information",
         .Description = "Returns information about tablets"
     });
+    yaml.AddParameter({
+        .Name = "database",
+        .Description = "database name",
+        .Type = "string",
+    });
     yaml.AddParameter({
         .Name = "node_id",
         .Description = "node identifier",

ydb/core/viewer/json_wb_req.h

@@ -24,17 +24,16 @@ class TJsonWhiteboardRequest : public TWhiteboardRequest<TRequestEventType, TRes
     using TThis = TJsonWhiteboardRequest<TRequestEventType, TResponseEventType>;
     using TBase = TWhiteboardRequest<TRequestEventType, TResponseEventType>;
     using TResponseType = typename TResponseEventType::ProtoRecordType;
-    IViewer* Viewer;
-    NMon::TEvHttpInfo::TPtr Event;
+    using TBase::Event;
+    using TBase::ReplyAndPassAway;
     TJsonSettings JsonSettings;
 
     static constexpr NKikimrServices::TActivity::EType ActorActivityType() {
         return NKikimrServices::TActivity::VIEWER_HANDLER;
     }
 
     TJsonWhiteboardRequest(IViewer* viewer, NMon::TEvHttpInfo::TPtr& ev)
-        : Viewer(viewer)
-        , Event(ev)
+        : TBase(viewer, ev)
     {}
 
     void Bootstrap() override {
@@ -65,7 +64,6 @@ class TJsonWhiteboardRequest : public TWhiteboardRequest<TRequestEventType, TRes
             TBase::RequestSettings.StaticNodesOnly = FromStringWithDefault<bool>(params.Get("static"), false);
         }
         TBase::RequestSettings.Format = params.Get("format");
-
         TBase::Bootstrap();
     }
 
@@ -120,11 +118,10 @@ class TJsonWhiteboardRequest : public TWhiteboardRequest<TRequestEventType, TRes
                 }
                 json << '}';
             }
-            TBase::Send(Event->Sender, new NMon::TEvHttpInfoRes(Viewer->GetHTTPOKJSON(Event->Get(), std::move(json.Str())), 0, NMon::IEvHttpInfoRes::EContentType::Custom));
+            ReplyAndPassAway(TBase::GetHTTPOKJSON(json.Str()));
         } catch (const std::exception& e) {
-            TBase::Send(Event->Sender, new NMon::TEvHttpInfoRes(TString("HTTP/1.1 400 Bad Request\r\n\r\n") + e.what(), 0, NMon::IEvHttpInfoRes::EContentType::Custom));
+            ReplyAndPassAway(TBase::GetHTTPBADREQUEST("text/plain", e.what()));
         }
-        TBase::PassAway();
     }
 };
 

ydb/core/viewer/viewer_tabletinfo.h

@@ -84,6 +84,19 @@ class TJsonTabletInfo : public TJsonWhiteboardRequest<TEvWhiteboard::TEvTabletSt
     void Bootstrap() override {
         BLOG_TRACE("Bootstrap()");
         const auto& params(Event->Get()->Request.GetParams());
+        TBase::RequestSettings.Timeout = FromStringWithDefault<ui32>(params.Get("timeout"), 10000);
+        TString database = params.Get("database");
+        if (database) {
+            RegisterWithSameMailbox(CreateBoardLookupActor(MakeEndpointsBoardPath(database), TBase::SelfId(), EBoardLookupMode::Second));
+            Become(&TThis::StateRequestedLookup, TDuration::MilliSeconds(TBase::RequestSettings.Timeout), new TEvents::TEvWakeup());
+            return;
+        }
+        CheckPath();
+    }
+
+    void CheckPath() {
+        BLOG_TRACE("CheckPath()");
+        const auto& params(Event->Get()->Request.GetParams());
         ReplyWithDeadTabletsInfo = params.Has("path");
         if (params.Has("path")) {
             TBase::RequestSettings.Timeout = FromStringWithDefault<ui32>(params.Get("timeout"), 10000);
@@ -94,23 +107,31 @@ class TJsonTabletInfo : public TJsonWhiteboardRequest<TEvWhiteboard::TEvTabletSt
             }
             NKikimrSchemeOp::TDescribePath* record = request->Record.MutableDescribePath();
             record->SetPath(params.Get("path"));
-
-            TActorId txproxy = MakeTxProxyID();
-            TBase::Send(txproxy, request.Release());
-            UnsafeBecome(&TThis::StateRequestedDescribe, TDuration::MilliSeconds(TBase::RequestSettings.Timeout), new TEvents::TEvWakeup());
+            TBase::Send(MakeTxProxyID(), request.Release());
+            Become(&TThis::StateRequestedDescribe, TDuration::MilliSeconds(TBase::RequestSettings.Timeout), new TEvents::TEvWakeup());
         } else {
             TBase::Bootstrap();
-            if (!TBase::RequestSettings.FilterFields.empty()) {
-                if (IsMatchesWildcard(TBase::RequestSettings.FilterFields, "(TabletId=*)")) {
-                    TString strTabletId(TBase::RequestSettings.FilterFields.substr(10, TBase::RequestSettings.FilterFields.size() - 11));
-                    TTabletId uiTabletId(FromStringWithDefault<TTabletId>(strTabletId, {}));
-                    if (uiTabletId) {
-                        Tablets[uiTabletId] = NKikimrTabletBase::TTabletTypes::Unknown;
-                        Request->Record.AddFilterTabletId(uiTabletId);
-                    }
+        }
+    }
+
+    THolder<TEvWhiteboard::TEvTabletStateRequest> BuildRequest() override {
+        THolder<TEvWhiteboard::TEvTabletStateRequest> request = TBase::BuildRequest();
+        if (!TBase::RequestSettings.FilterFields.empty()) {
+            if (IsMatchesWildcard(TBase::RequestSettings.FilterFields, "(TabletId=*)")) {
+                TString strTabletId(TBase::RequestSettings.FilterFields.substr(10, TBase::RequestSettings.FilterFields.size() - 11));
+                TTabletId uiTabletId(FromStringWithDefault<TTabletId>(strTabletId, {}));
+                if (uiTabletId) {
+                    Tablets[uiTabletId] = NKikimrTabletBase::TTabletTypes::Unknown;
+                    Request->Record.AddFilterTabletId(uiTabletId);
                 }
             }
         }
+        return request;
+    }
+
+    void Handle(TEvStateStorage::TEvBoardInfo::TPtr& ev) {
+        TBase::RequestSettings.FilterNodeIds = TBase::GetNodesFromBoardReply(ev);
+        CheckPath();
     }
 
     TString GetColumnValue(const TCell& cell, const NKikimrSchemeOp::TColumnDescription& type) {
@@ -343,6 +364,13 @@ class TJsonTabletInfo : public TJsonWhiteboardRequest<TEvWhiteboard::TEvTabletSt
         TBase::FilterResponse(response);
     }
 
+    STATEFN(StateRequestedLookup) {
+        switch (ev->GetTypeRewrite()) {
+            hFunc(TEvStateStorage::TEvBoardInfo, Handle);
+            cFunc(TEvents::TSystem::Wakeup, HandleTimeout);
+        }
+    }
+
     STATEFN(StateRequestedDescribe) {
         switch (ev->GetTypeRewrite()) {
             hFunc(NSchemeShard::TEvSchemeShard::TEvDescribeSchemeResult, Handle);

ydb/core/viewer/wb_req.h

@@ -50,8 +50,11 @@ class TWhiteboardRequest : public TViewerPipeClient {
     }
 
     TWhiteboardRequest() = default;
+    TWhiteboardRequest(IViewer* viewer, NMon::TEvHttpInfo::TPtr& ev)
+        : TBase(viewer, ev)
+    {}
 
-    THolder<TRequestEventType> BuildRequest() {
+    virtual THolder<TRequestEventType> BuildRequest() {
         THolder<TRequestEventType> request = MakeHolder<TRequestEventType>();
         constexpr bool hasFormat = requires(const TRequestEventType* r) {r->Record.GetFormat();};
         if constexpr (hasFormat) {