fix cluster tablets grouping (#8904)

ydb-platform · Sep 8, 2024 · 6ac4fc5 · 6ac4fc5
1 parent 6c38063
commit 6ac4fc5
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git a/ydb/core/viewer/viewer_cluster.h b/ydb/core/viewer/viewer_cluster.h
@@ -396,7 +396,6 @@ class TJsonCluster : public TViewerPipeClient {
                 if (node->Static) {
                     if (TabletStateResponse.count(nodeId) == 0) {
                         auto request = std::make_unique<TEvWhiteboard::TEvTabletStateRequest>();
-                        request->Record.SetGroupBy("Type,State");
                         TabletStateResponse.emplace(nodeId, MakeWhiteboardRequest(nodeId, request.release()));
                         ++WhiteboardStateRequestsInFlight;
                     }

diff --git a/ydb/core/viewer/viewer_nodes.h b/ydb/core/viewer/viewer_nodes.h
@@ -1534,7 +1534,7 @@ class TJsonNodes : public TViewerPipeClient {
             }
             if (FieldsNeeded(FieldsTablets) && TabletViewerResponse.count(nodeId) == 0) {
                 auto viewerRequest = std::make_unique<TEvViewer::TEvViewerRequest>();
-                viewerRequest->Record.MutableTabletRequest()->SetGroupBy("NodeId,Type,State");
+                viewerRequest->Record.MutableTabletRequest()->SetGroupBy("Type,State");
                 viewerRequest->Record.SetTimeout(Timeout / 2);
                 for (const TNode* node : batch.NodesToAskAbout) {
                     viewerRequest->Record.MutableLocation()->AddNodeId(node->GetNodeId());
@@ -1652,14 +1652,10 @@ class TJsonNodes : public TViewerPipeClient {
         if (FieldsNeeded(FieldsTablets)) {
             for (auto& [nodeId, response] : TabletViewerResponse) {
                 if (response.IsOk()) {
-                    Cerr << "Good tablet response for node " << nodeId << Endl;
-                    Cerr << "LocationResponded: " << response.Get()->Record.GetLocationResponded().ShortDebugString() << Endl;
                     auto& tabletResponse(*(response.Get()->Record.MutableTabletResponse()));
                     if (tabletResponse.TabletStateInfoSize() > 0 && !tabletResponse.GetTabletStateInfo(0).HasCount()) {
-                        Cerr << "TabletResponse before merge: " << tabletResponse.ShortDebugString() << Endl;
                         GroupWhiteboardResponses(tabletResponse, "NodeId,Type,State");
                     }
-                    Cerr << "TabletResponse: " << tabletResponse.ShortDebugString() << Endl;
                     for (const auto& tabletState : tabletResponse.GetTabletStateInfo()) {
                         TNode* node = FindNode(tabletState.GetNodeId());
                         if (node) {
@@ -1671,8 +1667,6 @@ class TJsonNodes : public TViewerPipeClient {
                             }
                         }
                     }
-                } else {
-                    Cerr << "Bad tablet response for node " << nodeId << Endl;
                 }
             }
             for (auto& [nodeId, response] : TabletStateResponse) {