Add exclusive nodes to new json/nodes endpoint KIKIMR-20675

pixcc · Jan 23, 2024 · fa31b2a · fa31b2a
1 parent e3e5ca6
commit fa31b2a
Show file tree

Hide file tree

Showing 4 changed files with 451 additions and 4 deletions.
diff --git a/ydb/core/viewer/json_compute.h b/ydb/core/viewer/json_compute.h
@@ -285,8 +285,8 @@ class TJsonCompute : public TViewerPipeClient<TJsonCompute> {
             auto nodeId = nodeStat.GetNodeId();
             if (IsRequiredNode(nodeId)) {
                 const auto& nodeDomain = nodeStat.GetNodeDomain();
-                TPathId subDomainKey(nodeDomain.GetSchemeShard(), nodeDomain.GetPathId());
-                if (FilterSubDomain && FilterSubDomain != subDomainKey) {
+                const TPathId subDomain(nodeDomain.GetSchemeShard(), nodeDomain.GetPathId());
+                if (FilterSubDomain && FilterSubDomain != subDomain) {
                     continue;
                 }
                 NodeIds.emplace_back(nodeId); // order is important

diff --git a/ydb/core/viewer/json_nodes.h b/ydb/core/viewer/json_nodes.h
@@ -40,6 +40,7 @@ class TJsonNodes : public TViewerPipeClient<TJsonNodes> {
     TJsonSettings JsonSettings;
     ui32 Timeout = 0;
     TString FilterTenant;
+    TSubDomainKey FilterSubDomainKey;
     TString FilterPath;
     TString FilterStoragePool;
     std::unordered_set<TNodeId> FilterNodeIds;
@@ -405,6 +406,11 @@ class TJsonNodes : public TViewerPipeClient<TJsonNodes> {
                 if (HiveId == 0) {
                     HiveId = entry.DomainInfo->Params.GetHive();
                 }
+                if (!FilterSubDomainKey) {
+                    const auto ownerId = entry.DomainInfo->DomainKey.OwnerId;
+                    const auto localPathId = entry.DomainInfo->DomainKey.LocalPathId;
+                    FilterSubDomainKey = TSubDomainKey(ownerId, localPathId);
+                }
                 if (entry.DomainInfo->ResourcesDomainKey && entry.DomainInfo->DomainKey != entry.DomainInfo->ResourcesDomainKey) {
                     TPathId resourceDomainKey(entry.DomainInfo->ResourcesDomainKey);
                     BLOG_TRACE("Requesting navigate for resource domain " << resourceDomainKey);
@@ -461,6 +467,10 @@ class TJsonNodes : public TViewerPipeClient<TJsonNodes> {
     void Handle(TEvHive::TEvResponseHiveNodeStats::TPtr& ev) {
         BLOG_TRACE("ResponseHiveNodeStats()");
         for (const NKikimrHive::THiveNodeStats& nodeStats : ev->Get()->Record.GetNodeStats()) {
+            const TSubDomainKey nodeSubDomainKey = TSubDomainKey(nodeStats.GetNodeDomain());
+            if (FilterSubDomainKey && FilterSubDomainKey != nodeSubDomainKey) {
+                continue;
+            }
             ui32 nodeId = nodeStats.GetNodeId();
             auto& tabletInfo(TabletInfo[nodeId]);
             for (const NKikimrHive::THiveDomainStatsStateCount& stateStats : nodeStats.GetStateStats()) {
@@ -514,14 +524,18 @@ class TJsonNodes : public TViewerPipeClient<TJsonNodes> {
     }
 
     void Handle(TEvStateStorage::TEvBoardInfo::TPtr& ev) {
-        BLOG_TRACE("Received TEvBoardInfo");
         if (ev->Get()->Status == TEvStateStorage::TEvBoardInfo::EStatus::Ok) {
+            BLOG_TRACE("Received TEvBoardInfo");
             for (const auto& [actorId, infoEntry] : ev->Get()->InfoEntries) {
                 auto nodeId(actorId.NodeId());
                 BLOG_TRACE("BoardInfo filter node by " << nodeId);
                 FilterNodeIds.insert(nodeId);
             }
+        } else {
+            BLOG_TRACE("Error receiving TEvBoardInfo response");
+            FilterNodeIds = { 0 };
         }
+
         if (--RequestsBeforeNodeList == 0) {
             ProcessNodeIds();
         }

diff --git a/ydb/core/viewer/json_tenantinfo.h b/ydb/core/viewer/json_tenantinfo.h
@@ -667,7 +667,8 @@ class TJsonTenantInfo : public TViewerPipeClient<TJsonTenantInfo> {
 
                 if (tenant.GetType() == NKikimrViewer::Serverless) {
                     tenant.SetStorageAllocatedSize(tenant.GetMetrics().GetStorage());
-                    if (tenant.NodeIdsSize() == 0) {
+                    const bool noExclusiveNodes = tenantNodes.empty();
+                    if (noExclusiveNodes) {
                         tenant.SetMemoryUsed(tenant.GetMetrics().GetMemory());
                         tenant.ClearMemoryLimit();
                         tenant.SetCoresUsed(static_cast<double>(tenant.GetMetrics().GetCPU()) / 1000000);