fix nodes type, introduce storage type for nodes (#9575)

Author: adameat

ydb/core/viewer/json_handlers_viewer.cpp

@@ -243,7 +243,7 @@ void InitViewerHealthCheckJsonHandler(TJsonHandlers& handlers) {
 }
 
 void InitViewerNodesJsonHandler(TJsonHandlers& handlers) {
-    handlers.AddHandler("/viewer/nodes", new TJsonHandler<TJsonNodes>(TJsonNodes::GetSwagger()), 5);
+    handlers.AddHandler("/viewer/nodes", new TJsonHandler<TJsonNodes>(TJsonNodes::GetSwagger()), 6);
 }
 
 void InitViewerACLJsonHandler(TJsonHandlers &jsonHandlers) {

ydb/core/viewer/viewer_nodes.h

@@ -35,6 +35,7 @@ enum class ENodeFields : ui8 {
     SubDomainKey,
     DisconnectTime,
     Database,
+    HasDisks,
     COUNT
 };
 
@@ -124,6 +125,7 @@ class TJsonNodes : public TViewerPipeClient {
         Any,
         Static,
         Dynamic,
+        Storage,
     };
     EType Type = EType::Any;
 
@@ -660,6 +662,9 @@ class TJsonNodes : public TViewerPipeClient {
         } else if (params.Get("type") == "dynamic") {
             Type = EType::Dynamic;
             FieldsRequired.set(+ENodeFields::NodeInfo);
+        } else if (params.Get("type") == "storage") {
+            Type = EType::Storage;
+            FieldsRequired.set(+ENodeFields::NodeInfo);
         } else if (params.Get("type") == "any") {
             Type = EType::Any;
         }
@@ -866,6 +871,42 @@ class TJsonNodes : public TViewerPipeClient {
         if (FilterStorageStage != EFilterStorageStage::None) {
             return;
         }
+        if (((Type == EType::Static || Type == EType::Dynamic) && FieldsAvailable.test(+ENodeFields::NodeInfo)) || (Type == EType::Storage && FieldsAvailable.test(+ENodeFields::HasDisks))) {
+            TNodeView nodeView;
+            switch (Type) {
+                case EType::Static:
+                    for (TNode* node : NodeView) {
+                        if (node->IsStatic()) {
+                            nodeView.push_back(node);
+                        }
+                    }
+                    break;
+                case EType::Dynamic:
+                    for (TNode* node : NodeView) {
+                        if (!node->IsStatic()) {
+                            nodeView.push_back(node);
+                        }
+                    }
+                    break;
+                case EType::Storage:
+                    for (TNode* node : NodeView) {
+                        if (node->HasDisks) {
+                            nodeView.push_back(node);
+                        }
+                    }
+                    break;
+                case EType::Any:
+                    break;
+            }
+            NodeView.swap(nodeView);
+            FoundNodes = TotalNodes = NodeView.size();
+            Type = EType::Any;
+            InvalidateNodes();
+        }
+        // storage/nodes pre-filter, affects TotalNodes count
+        if (Type != EType::Any) {
+            return;
+        }
         if (!FilterNodeIds.empty() && FieldsAvailable.test(+ENodeFields::NodeId)) {
             TNodeView nodeView;
             for (TNode* node : NodeView) {
@@ -901,17 +942,6 @@ class TJsonNodes : public TViewerPipeClient {
                 With = EWith::Everything;
                 InvalidateNodes();
             }
-            if (Type != EType::Any && FieldsAvailable.test(+ENodeFields::NodeInfo)) {
-                TNodeView nodeView;
-                for (TNode* node : NodeView) {
-                    if ((Type == EType::Static && node->IsStatic()) || (Type == EType::Dynamic && !node->IsStatic())) {
-                        nodeView.push_back(node);
-                    }
-                }
-                NodeView.swap(nodeView);
-                Type = EType::Any;
-                InvalidateNodes();
-            }
             if (ProblemNodesOnly && FieldsAvailable.test(+ENodeFields::SystemState)) {
                 TNodeView nodeView;
                 for (TNode* node : NodeView) {
@@ -1021,6 +1051,7 @@ class TJsonNodes : public TViewerPipeClient {
                 case ENodeFields::CPU:
                 case ENodeFields::LoadAverage:
                 case ENodeFields::DisconnectTime:
+                case ENodeFields::HasDisks:
                     break;
             }
         }
@@ -1088,6 +1119,7 @@ class TJsonNodes : public TViewerPipeClient {
                 case ENodeFields::Tablets:
                 case ENodeFields::SubDomainKey:
                 case ENodeFields::DisconnectTime:
+                case ENodeFields::HasDisks:
                 case ENodeFields::COUNT:
                     break;
             }
@@ -1553,6 +1585,7 @@ class TJsonNodes : public TViewerPipeClient {
                     ++slots;
                     MaximumSlotsPerDisk = std::max(MaximumSlotsPerDisk.value_or(0), slots);
                 }
+                FieldsAvailable.set(+ENodeFields::HasDisks);
                 FilterStorageStage = EFilterStorageStage::None;
                 ApplyEverything();
             } else {
@@ -1576,6 +1609,7 @@ class TJsonNodes : public TViewerPipeClient {
                 for (TNode* node : NodeView) {
                     node->CalcDisks();
                 }
+                FieldsAvailable.set(+ENodeFields::HasDisks);
                 FieldsAvailable.set(+ENodeFields::Missing);
                 FieldsAvailable.set(+ENodeFields::DiskSpaceUsage);
             } else {
@@ -2288,6 +2322,7 @@ class TJsonNodes : public TViewerPipeClient {
                         return nodes of specific type:
                           * `static`
                           * `dynamic`
+                          * `storage`
                           * `any`
                   - name: with
                     in: query