add MemoryDetailed field to viewer/nodes handler (#10694)

Author: adameat

ydb/core/viewer/json_handlers_viewer.cpp

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

ydb/core/viewer/viewer_nodes.h

@@ -28,6 +28,7 @@ enum class ENodeFields : ui8 {
     Version,
     Uptime,
     Memory,
+    MemoryDetailed,
     CPU,
     LoadAverage,
     Missing,
@@ -586,6 +587,7 @@ class TJsonNodes : public TViewerPipeClient {
         { ENodeFields::LoadAverage, TFieldsType().set(+ENodeFields::SystemState) },
         { ENodeFields::Database, TFieldsType().set(+ENodeFields::SystemState) },
         { ENodeFields::Missing, TFieldsType().set(+ENodeFields::PDisks) },
+        { ENodeFields::MemoryDetailed, TFieldsType().set(+ENodeFields::SystemState) },
     };
 
     bool FieldsNeeded(TFieldsType fields) const {
@@ -634,6 +636,8 @@ class TJsonNodes : public TViewerPipeClient {
             result = ENodeFields::Uptime;
         } else if (field == "Memory") {
             result = ENodeFields::Memory;
+        } else if (field == "MemoryDetailed") {
+            result = ENodeFields::MemoryDetailed;
         } else if (field == "CPU") {
             result = ENodeFields::CPU;
         } else if (field == "LoadAverage") {
@@ -1116,6 +1120,7 @@ class TJsonNodes : public TViewerPipeClient {
                 case ENodeFields::SubDomainKey:
                 case ENodeFields::COUNT:
                 case ENodeFields::Memory:
+                case ENodeFields::MemoryDetailed:
                 case ENodeFields::CPU:
                 case ENodeFields::LoadAverage:
                 case ENodeFields::DisconnectTime:
@@ -1157,6 +1162,7 @@ class TJsonNodes : public TViewerPipeClient {
                     NeedSort = false;
                     break;
                 case ENodeFields::Memory:
+                case ENodeFields::MemoryDetailed:
                     SortCollection(NodeView, [](const TNode* node) { return node->SystemState.GetMemoryUsed(); }, ReverseSort);
                     NeedSort = false;
                     break;
@@ -1709,6 +1715,20 @@ class TJsonNodes : public TViewerPipeClient {
         }
     }
 
+    template<>
+    void InitWhiteboardRequest(NKikimrWhiteboard::TEvSystemStateRequest* request) {
+        if (AllWhiteboardFields) {
+            request->AddFieldsRequired(-1);
+        } else {
+            for (auto field : {1, 2, 4, 5, 6, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 30, 31, 36, 37}) { // node_whiteboard.proto
+                request->AddFieldsRequired(field);
+            }
+            if (FieldsRequired.test(+ENodeFields::MemoryDetailed)) {
+                request->AddFieldsRequired(38);
+            }
+        }
+    }
+
     void SendWhiteboardSystemAndTabletsBatch(TNodeBatch& batch) {
         TNodeId nodeId = OffloadMerge ? batch.ChooseNodeId() : 0;
         if (batch.HasStaticNodes && (FieldsNeeded(FieldsVDisks) || FieldsNeeded(FieldsPDisks))) {
@@ -1798,6 +1818,7 @@ class TJsonNodes : public TViewerPipeClient {
     void ProcessWhiteboard() {
         if (FieldsNeeded(FieldsSystemState)) {
             TInstant now = TInstant::Now();
+            bool hasMemoryDetailed = false;
             std::unordered_set<TNodeId> removeNodes;
             for (const auto& [responseNodeId, response] : SystemViewerResponse) {
                 if (response.IsOk()) {
@@ -1818,6 +1839,7 @@ class TJsonNodes : public TViewerPipeClient {
                                 }
                             }
                         }
+                        hasMemoryDetailed |= systemInfo.HasMemoryStats();
                     }
                     for (auto nodeId : nodesWithoutData) {
                         TNode* node = FindNode(nodeId);
@@ -1845,6 +1867,7 @@ class TJsonNodes : public TViewerPipeClient {
                                 }
                             }
                         }
+                        hasMemoryDetailed |= systemState.GetSystemStateInfo(0).HasMemoryStats();
                     }
                 } else {
                     TNode* node = FindNode(nodeId);
@@ -1860,6 +1883,9 @@ class TJsonNodes : public TViewerPipeClient {
             }
             FieldsAvailable |= FieldsSystemState;
             FieldsAvailable.set(+ENodeFields::Database);
+            if (hasMemoryDetailed) {
+                FieldsAvailable.set(+ENodeFields::MemoryDetailed);
+            }
         }
         if (FieldsNeeded(FieldsTablets)) {
             for (auto& [nodeId, response] : TabletViewerResponse) {
@@ -2477,7 +2503,7 @@ class TJsonNodes : public TViewerPipeClient {
                           * `Rack`
                           * `Version`
                           * `Uptime`
-                          * `Memory`
+                          * `Memory` / `MemoryDetailed`
                           * `CPU`
                           * `LoadAverage`
                           * `Missing`
@@ -2538,6 +2564,7 @@ class TJsonNodes : public TViewerPipeClient {
                           * `Version`
                           * `Uptime`
                           * `Memory`
+                          * `MemoryDetailed`
                           * `CPU`
                           * `LoadAverage`
                           * `Missing`