Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix cluster tablets grouping #8904

Merged
merged 1 commit into from
Sep 8, 2024
Merged

fix cluster tablets grouping #8904

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion ydb/core/viewer/viewer_cluster.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
8 changes: 1 addition & 7 deletions ydb/core/viewer/viewer_nodes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down Expand Up @@ -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) {
Expand All @@ -1671,8 +1667,6 @@ class TJsonNodes : public TViewerPipeClient {
}
}
}
} else {
Cerr << "Bad tablet response for node " << nodeId << Endl;
}
}
for (auto& [nodeId, response] : TabletStateResponse) {
Expand Down
Loading