@@ -261,25 +261,17 @@ class TJsonTenantInfo : public TViewerPipeClient {
261261
262262 void SendWhiteboardSystemStateRequest (const TNodeId nodeId) {
263263 Subscribers.insert (nodeId);
264- TActorId whiteboardServiceId = MakeNodeWhiteboardServiceId (nodeId);
265264 if (SystemStateResponse.count (nodeId) == 0 ) {
266- SystemStateResponse.emplace (nodeId, MakeRequest<TEvWhiteboard::TEvSystemStateResponse>(whiteboardServiceId,
267- new TEvWhiteboard::TEvSystemStateRequest (),
268- IEventHandle::FlagTrackDelivery | IEventHandle::FlagSubscribeOnSession,
269- nodeId));
265+ SystemStateResponse.emplace (nodeId, MakeWhiteboardRequest (nodeId, new TEvWhiteboard::TEvSystemStateRequest ()));
270266 }
271267 }
272268
273269 void SendWhiteboardTabletStateRequest (const TNodeId nodeId) {
274270 Subscribers.insert (nodeId);
275- TActorId whiteboardServiceId = MakeNodeWhiteboardServiceId (nodeId);
276271 if (TabletStateResponse.count (nodeId) == 0 ) {
277272 auto request = std::make_unique<NNodeWhiteboard::TEvWhiteboard::TEvTabletStateRequest>();
278273 request->Record .SetFormat (" packed5" );
279- TabletStateResponse.emplace (nodeId, MakeRequest<TEvWhiteboard::TEvTabletStateResponse>(whiteboardServiceId,
280- request.release (),
281- IEventHandle::FlagTrackDelivery | IEventHandle::FlagSubscribeOnSession,
282- nodeId));
274+ TabletStateResponse.emplace (nodeId, MakeWhiteboardRequest (nodeId, request.release ()));
283275 }
284276 }
285277
@@ -533,7 +525,7 @@ class TJsonTenantInfo : public TViewerPipeClient {
533525 }
534526
535527 void ReplyAndPassAway () override {
536- Result.SetVersion (2 );
528+ Result.SetVersion (Viewer-> GetCapabilityVersion ( " /viewer/tenantinfo " ) );
537529 THashMap<TString, NKikimrViewer::EFlag> OverallByDomainId;
538530 std::unordered_map<TNodeId, const NKikimrWhiteboard::TSystemStateInfo*> nodeSystemStateInfo;
539531
0 commit comments