Skip to content

Commit 6ac4fc5

Browse files
authored
fix cluster tablets grouping (#8904)
1 parent 6c38063 commit 6ac4fc5

File tree

2 files changed

+1
-8
lines changed

2 files changed

+1
-8
lines changed

ydb/core/viewer/viewer_cluster.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,6 @@ class TJsonCluster : public TViewerPipeClient {
396396
if (node->Static) {
397397
if (TabletStateResponse.count(nodeId) == 0) {
398398
auto request = std::make_unique<TEvWhiteboard::TEvTabletStateRequest>();
399-
request->Record.SetGroupBy("Type,State");
400399
TabletStateResponse.emplace(nodeId, MakeWhiteboardRequest(nodeId, request.release()));
401400
++WhiteboardStateRequestsInFlight;
402401
}

ydb/core/viewer/viewer_nodes.h

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1534,7 +1534,7 @@ class TJsonNodes : public TViewerPipeClient {
15341534
}
15351535
if (FieldsNeeded(FieldsTablets) && TabletViewerResponse.count(nodeId) == 0) {
15361536
auto viewerRequest = std::make_unique<TEvViewer::TEvViewerRequest>();
1537-
viewerRequest->Record.MutableTabletRequest()->SetGroupBy("NodeId,Type,State");
1537+
viewerRequest->Record.MutableTabletRequest()->SetGroupBy("Type,State");
15381538
viewerRequest->Record.SetTimeout(Timeout / 2);
15391539
for (const TNode* node : batch.NodesToAskAbout) {
15401540
viewerRequest->Record.MutableLocation()->AddNodeId(node->GetNodeId());
@@ -1652,14 +1652,10 @@ class TJsonNodes : public TViewerPipeClient {
16521652
if (FieldsNeeded(FieldsTablets)) {
16531653
for (auto& [nodeId, response] : TabletViewerResponse) {
16541654
if (response.IsOk()) {
1655-
Cerr << "Good tablet response for node " << nodeId << Endl;
1656-
Cerr << "LocationResponded: " << response.Get()->Record.GetLocationResponded().ShortDebugString() << Endl;
16571655
auto& tabletResponse(*(response.Get()->Record.MutableTabletResponse()));
16581656
if (tabletResponse.TabletStateInfoSize() > 0 && !tabletResponse.GetTabletStateInfo(0).HasCount()) {
1659-
Cerr << "TabletResponse before merge: " << tabletResponse.ShortDebugString() << Endl;
16601657
GroupWhiteboardResponses(tabletResponse, "NodeId,Type,State");
16611658
}
1662-
Cerr << "TabletResponse: " << tabletResponse.ShortDebugString() << Endl;
16631659
for (const auto& tabletState : tabletResponse.GetTabletStateInfo()) {
16641660
TNode* node = FindNode(tabletState.GetNodeId());
16651661
if (node) {
@@ -1671,8 +1667,6 @@ class TJsonNodes : public TViewerPipeClient {
16711667
}
16721668
}
16731669
}
1674-
} else {
1675-
Cerr << "Bad tablet response for node " << nodeId << Endl;
16761670
}
16771671
}
16781672
for (auto& [nodeId, response] : TabletStateResponse) {

0 commit comments

Comments
 (0)