Show exclusive nodes in embedded ui KIKIMR-20675

ydb-platform · Jan 22, 2024 · e3e5ca6 · e3e5ca6
1 parent e89c288
commit e3e5ca6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/ydb/core/viewer/json_compute.h b/ydb/core/viewer/json_compute.h
@@ -284,6 +284,11 @@ class TJsonCompute : public TViewerPipeClient<TJsonCompute> {
         for (const NKikimrHive::THiveNodeStats& nodeStat : nodeStats) {
             auto nodeId = nodeStat.GetNodeId();
             if (IsRequiredNode(nodeId)) {
+                const auto& nodeDomain = nodeStat.GetNodeDomain();
+                TPathId subDomainKey(nodeDomain.GetSchemeShard(), nodeDomain.GetPathId());
+                if (FilterSubDomain && FilterSubDomain != subDomainKey) {
+                    continue;
+                }
                 NodeIds.emplace_back(nodeId); // order is important
                 TActorId whiteboardServiceId = MakeNodeWhiteboardServiceId(nodeId);
                 THolder<NNodeWhiteboard::TEvWhiteboard::TEvSystemStateRequest> request = MakeHolder<NNodeWhiteboard::TEvWhiteboard::TEvSystemStateRequest>();

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