Skip to content

Commit 89a663c

Browse files
authored
optimize cluster handler (#8619)
1 parent e43c2fc commit 89a663c

File tree

9 files changed

+710
-394
lines changed

9 files changed

+710
-394
lines changed

ydb/core/viewer/json_handlers_viewer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ void InitViewerStorageUsageJsonHandler(TJsonHandlers &handlers) {
203203
}
204204

205205
void InitViewerClusterJsonHandler(TJsonHandlers& handlers) {
206-
handlers.AddHandler("/viewer/cluster", new TJsonHandler<TJsonCluster>(TJsonCluster::GetSwagger()));
206+
handlers.AddHandler("/viewer/cluster", new TJsonHandler<TJsonCluster>(TJsonCluster::GetSwagger()), 2);
207207
}
208208

209209
void InitViewerLabeledCountersJsonHandler(TJsonHandlers &handlers) {

ydb/core/viewer/json_pipe_req.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -400,6 +400,11 @@ TViewerPipeClient::TRequestResponse<NSysView::TEvSysView::TEvGetPDisksResponse>
400400
return MakeRequestToPipe<NSysView::TEvSysView::TEvGetPDisksResponse>(pipeClient, request.release());
401401
}
402402

403+
TViewerPipeClient::TRequestResponse<NSysView::TEvSysView::TEvGetStorageStatsResponse> TViewerPipeClient::RequestBSControllerStorageStats() {
404+
TActorId pipeClient = ConnectTabletPipe(GetBSControllerId());
405+
return MakeRequestToPipe<NSysView::TEvSysView::TEvGetStorageStatsResponse>(pipeClient, new NSysView::TEvSysView::TEvGetStorageStatsRequest());
406+
}
407+
403408
void TViewerPipeClient::RequestBSControllerPDiskUpdateStatus(const NKikimrBlobStorage::TUpdateDriveStatus& driveStatus, bool force) {
404409
TActorId pipeClient = ConnectTabletPipe(GetBSControllerId());
405410
THolder<TEvBlobStorage::TEvControllerConfigRequest> request = MakeHolder<TEvBlobStorage::TEvControllerConfigRequest>();

ydb/core/viewer/json_pipe_req.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,7 @@ class TViewerPipeClient : public TActorBootstrapped<TViewerPipeClient> {
222222
TRequestResponse<NSysView::TEvSysView::TEvGetStoragePoolsResponse> RequestBSControllerPools();
223223
TRequestResponse<NSysView::TEvSysView::TEvGetVSlotsResponse> RequestBSControllerVSlots();
224224
TRequestResponse<NSysView::TEvSysView::TEvGetPDisksResponse> RequestBSControllerPDisks();
225+
TRequestResponse<NSysView::TEvSysView::TEvGetStorageStatsResponse> RequestBSControllerStorageStats();
225226
void RequestBSControllerPDiskUpdateStatus(const NKikimrBlobStorage::TUpdateDriveStatus& driveStatus, bool force = false);
226227
void RequestSchemeCacheNavigate(const TString& path);
227228
void RequestSchemeCacheNavigate(const TPathId& pathId);

ydb/core/viewer/protos/viewer.proto

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -314,8 +314,11 @@ enum EFlag {
314314
}
315315

316316
message TClusterInfo {
317-
string Name = 1;
318-
EFlag Overall = 2;
317+
uint32 Version = 1;
318+
string Name = 2;
319+
string Domain = 3;
320+
EFlag Overall = 5;
321+
repeated string Problems = 9;
319322
uint32 NodesTotal = 10;
320323
uint32 NodesAlive = 11;
321324
uint32 NumberOfCpus = 20;
@@ -324,13 +327,17 @@ message TClusterInfo {
324327
uint64 MemoryUsed = 31;
325328
uint64 StorageTotal = 40;
326329
uint64 StorageUsed = 41;
327-
repeated string DataCenters = 42;
328-
repeated string Versions = 43;
329-
repeated NKikimrWhiteboard.TTabletStateInfo SystemTablets = 16;
330-
uint64 Hosts = 44;
331-
uint64 Tenants = 45;
332-
uint64 Tablets = 46;
333-
string Domain = 47;
330+
map<string, uint64> MapStorageTotal = 42;
331+
map<string, uint64> MapStorageUsed = 43;
332+
repeated string DataCenters = 44;
333+
map<string, uint32> MapDataCenters = 45;
334+
repeated string Versions = 46;
335+
map<string, uint32> MapVersions = 47;
336+
map<string, uint32> MapNodeStates = 48;
337+
repeated NKikimrWhiteboard.TTabletStateInfo SystemTablets = 50;
338+
repeated NKikimrSysView.TStorageStatsEntry StorageStats = 51;
339+
uint64 Hosts = 60;
340+
uint64 Tenants = 61;
334341
}
335342

336343
enum ETenantType {

0 commit comments

Comments
 (0)