@@ -261,25 +261,17 @@ class TJsonTenantInfo : public TViewerPipeClient {
261
261
262
262
void SendWhiteboardSystemStateRequest (const TNodeId nodeId) {
263
263
Subscribers.insert (nodeId);
264
- TActorId whiteboardServiceId = MakeNodeWhiteboardServiceId (nodeId);
265
264
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 ()));
270
266
}
271
267
}
272
268
273
269
void SendWhiteboardTabletStateRequest (const TNodeId nodeId) {
274
270
Subscribers.insert (nodeId);
275
- TActorId whiteboardServiceId = MakeNodeWhiteboardServiceId (nodeId);
276
271
if (TabletStateResponse.count (nodeId) == 0 ) {
277
272
auto request = std::make_unique<NNodeWhiteboard::TEvWhiteboard::TEvTabletStateRequest>();
278
273
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 ()));
283
275
}
284
276
}
285
277
@@ -533,7 +525,7 @@ class TJsonTenantInfo : public TViewerPipeClient {
533
525
}
534
526
535
527
void ReplyAndPassAway () override {
536
- Result.SetVersion (2 );
528
+ Result.SetVersion (Viewer-> GetCapabilityVersion ( " /viewer/tenantinfo " ) );
537
529
THashMap<TString, NKikimrViewer::EFlag> OverallByDomainId;
538
530
std::unordered_map<TNodeId, const NKikimrWhiteboard::TSystemStateInfo*> nodeSystemStateInfo;
539
531
0 commit comments