Skip to content

Commit 1e91691

Browse files
adameatadameat
authored
Merge d69d9aa into f1b886c 
2 parents f1b886c + d69d9aa commit 1e91691

6 files changed

Lines changed: 61 additions & 33 deletions

File tree

‎ydb/core/viewer/json_pipe_req.cpp‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -601,7 +601,16 @@ void TViewerPipeClient::InitConfig(const TCgiParameters& params) {
601601
}
602602
Direct = FromStringWithDefault<bool>(params.Get("direct"), Direct);
603603
JsonSettings.EnumAsNumbers = !FromStringWithDefault<bool>(params.Get("enums"), true);
604-
JsonSettings.UI64AsString = !FromStringWithDefault<bool>(params.Get("ui64"), true);
604+
JsonSettings.UI64AsString = !FromStringWithDefault<bool>(params.Get("ui64"), false);
605+
if (FromStringWithDefault<bool>(params.Get("enums"), true)) {
606+
Proto2JsonConfig.EnumMode = TProto2JsonConfig::EnumValueMode::EnumName;
607+
}
608+
if (!FromStringWithDefault<bool>(params.Get("ui64"), false)) {
609+
Proto2JsonConfig.StringifyNumbers = TProto2JsonConfig::EStringifyNumbersMode::StringifyInt64Always;
610+
}
611+
Proto2JsonConfig.MapAsObject = true;
612+
Proto2JsonConfig.ConvertAny = true;
613+
Proto2JsonConfig.WriteNanAsString = true;
605614
Timeout = TDuration::MilliSeconds(FromStringWithDefault<ui32>(params.Get("timeout"), Timeout.MilliSeconds()));
606615
}
607616

@@ -661,7 +670,7 @@ TString TViewerPipeClient::GetHTTPOKJSON(const NJson::TJsonValue& response, TIns
661670

662671
TString TViewerPipeClient::GetHTTPOKJSON(const google::protobuf::Message& response, TInstant lastModified) {
663672
TStringStream json;
664-
TProtoToJson::ProtoToJson(json, response, JsonSettings);
673+
NProtobufJson::Proto2Json(response, json, Proto2JsonConfig);
665674
return GetHTTPOKJSON(json.Str(), lastModified);
666675
}
667676

‎ydb/core/viewer/json_pipe_req.h‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,13 @@
1414
#include <ydb/library/actors/core/actor_bootstrapped.h>
1515
#include <ydb/library/actors/wilson/wilson_span.h>
1616
#include <ydb/library/wilson_ids/wilson.h>
17+
#include <library/cpp/protobuf/json/proto2json.h>
1718

1819
namespace NKikimr::NViewer {
1920

2021
using namespace NKikimr;
2122
using namespace NSchemeCache;
23+
using namespace NProtobufJson;
2224
using NNodeWhiteboard::TNodeId;
2325
using NNodeWhiteboard::TTabletId;
2426

@@ -36,7 +38,7 @@ class TViewerPipeClient : public TActorBootstrapped<TViewerPipeClient> {
3638
protected:
3739
bool Followers = true;
3840
bool Metrics = true;
39-
bool WithRetry = true;
41+
bool WithRetry = false;
4042
TString Database;
4143
TString SharedDatabase;
4244
bool Direct = false;
@@ -46,6 +48,7 @@ class TViewerPipeClient : public TActorBootstrapped<TViewerPipeClient> {
4648
IViewer* Viewer = nullptr;
4749
NMon::TEvHttpInfo::TPtr Event;
4850
TJsonSettings JsonSettings;
51+
TProto2JsonConfig Proto2JsonConfig;
4952
TDuration Timeout = TDuration::Seconds(10);
5053

5154
struct TPipeInfo {

‎ydb/core/viewer/storage_groups.h‎

Lines changed: 40 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -267,6 +267,7 @@ class TStorageGroups : public TViewerPipeClient {
267267
TString Erasure;
268268
TErasureType::EErasureSpecies ErasureSpecies = TErasureType::ErasureNone;
269269
TString State;
270+
ui32 StateSortKey = 0;
270271
ui32 EncryptionMode = 0;
271272
ui64 AllocationUnits = 0;
272273
float Usage = 0;
@@ -290,11 +291,13 @@ class TStorageGroups : public TViewerPipeClient {
290291
TString result;
291292
result += ::ToString(failedDomains.size());
292293
result += '(';
294+
bool was_domains = false;
293295
for (ui8 domains : failedDomains) {
294-
if (!result.empty()) {
296+
if (was_domains) {
295297
result += ',';
296298
}
297299
result += ::ToString(domains);
300+
was_domains = true;
298301
}
299302
result += ')';
300303
return result;
@@ -377,35 +380,43 @@ class TStorageGroups : public TViewerPipeClient {
377380
if (MissingDisks == 0) {
378381
Overall = NKikimrViewer::EFlag::Green;
379382
State = "ok";
383+
StateSortKey = 0;
380384
} else {
381385
if (ErasureSpecies == TErasureType::ErasureNone) {
382386
TString state;
383387
Overall = NKikimrViewer::EFlag::Red;
384388
if (MissingDisks == startingDisks) {
385389
state = "starting";
390+
StateSortKey = 10;
386391
} else {
387392
state = "dead";
393+
StateSortKey = 100;
388394
}
389395
State = TStringBuilder() << state << ':' << MissingDisks;
390396
} else if (ErasureSpecies == TErasureType::Erasure4Plus2Block) {
391397
TString state;
392398
if (MissingDisks > 2) {
393399
Overall = NKikimrViewer::EFlag::Red;
394400
state = "dead";
401+
StateSortKey = 100;
395402
} else if (MissingDisks == 2) {
396403
Overall = NKikimrViewer::EFlag::Orange;
397404
state = "degraded";
405+
StateSortKey = 50 + MissingDisks;
398406
} else if (MissingDisks == 1) {
399407
if (MissingDisks == replicatingDisks + startingDisks) {
400408
Overall = NKikimrViewer::EFlag::Blue;
401409
if (replicatingDisks) {
402410
state = "replicating";
411+
StateSortKey = 20;
403412
} else {
404413
state = "starting";
414+
StateSortKey = 10;
405415
}
406416
} else {
407417
Overall = NKikimrViewer::EFlag::Yellow;
408418
state = "degraded";
419+
StateSortKey = 50 + MissingDisks;
409420
}
410421
}
411422
State = TStringBuilder() << state << ':' << MissingDisks;
@@ -418,20 +429,25 @@ class TStorageGroups : public TViewerPipeClient {
418429
if (failedDomainsPerRealm.size() > 2 || (failedDomainsPerRealm.size() == 2 && failedDomainsPerRealm[1] > 1)) {
419430
Overall = NKikimrViewer::EFlag::Red;
420431
state = "dead";
432+
StateSortKey = 100;
421433
} else if (failedDomainsPerRealm.size() == 2) {
422434
Overall = NKikimrViewer::EFlag::Orange;
423435
state = "degraded";
436+
StateSortKey = 50 + failedDomainsPerRealm.size() * 10 + MissingDisks;
424437
} else if (failedDomainsPerRealm.size()) {
425438
if (MissingDisks == replicatingDisks + startingDisks) {
426439
Overall = NKikimrViewer::EFlag::Blue;
427440
if (replicatingDisks > startingDisks) {
428441
state = "replicating";
442+
StateSortKey = 20;
429443
} else {
430444
state = "starting";
445+
StateSortKey = 10;
431446
}
432447
} else {
433448
Overall = NKikimrViewer::EFlag::Yellow;
434449
state = "degraded";
450+
StateSortKey = 50 + failedDomainsPerRealm.size() * 10 + MissingDisks;
435451
}
436452
}
437453
State = TStringBuilder() << state << ':' << PrintDomains(failedDomainsPerRealm);
@@ -533,8 +549,9 @@ class TStorageGroups : public TViewerPipeClient {
533549
case EGroupFields::PoolName:
534550
case EGroupFields::Kind:
535551
case EGroupFields::MediaType:
536-
case EGroupFields::State:
537552
return GetGroupName(groupBy);
553+
case EGroupFields::State:
554+
return StateSortKey;
538555
case EGroupFields::Usage:
539556
return Usage;
540557
case EGroupFields::DiskSpaceUsage:
@@ -1029,19 +1046,12 @@ class TStorageGroups : public TViewerPipeClient {
10291046
TVector<TString> filterWords = SplitString(Filter, " ");
10301047
TGroupView groupView;
10311048
for (TGroup* group : GroupView) {
1032-
bool match = false;
10331049
for (const TString& word : filterWords) {
1034-
if (group->PoolName.Contains(word)) {
1035-
match = true;
1036-
break;
1037-
} else if (::ToString(group->GroupId).Contains(word)) {
1038-
match = true;
1050+
if (group->PoolName.Contains(word) || ::ToString(group->GroupId).Contains(word)) {
1051+
groupView.push_back(group);
10391052
break;
10401053
}
10411054
}
1042-
if (match) {
1043-
groupView.push_back(group);
1044-
}
10451055
}
10461056
GroupView.swap(groupView);
10471057
Filter.clear();
@@ -1091,11 +1101,11 @@ class TStorageGroups : public TViewerPipeClient {
10911101
case EGroupFields::Kind:
10921102
case EGroupFields::Encryption:
10931103
case EGroupFields::MediaType:
1094-
case EGroupFields::State:
10951104
GroupCollection();
10961105
SortCollection(GroupGroups, [](const TGroupGroup& groupGroup) { return groupGroup.SortKey; });
10971106
NeedGroup = false;
10981107
break;
1108+
case EGroupFields::State:
10991109
case EGroupFields::Usage:
11001110
case EGroupFields::DiskSpaceUsage:
11011111
case EGroupFields::MissingDisks:
@@ -1169,7 +1179,7 @@ class TStorageGroups : public TViewerPipeClient {
11691179
SortCollection(GroupView, [](const TGroup* group) { return group->Write; }, ReverseSort);
11701180
break;
11711181
case EGroupFields::State:
1172-
SortCollection(GroupView, [](const TGroup* group) { return group->State; }, ReverseSort);
1182+
SortCollection(GroupView, [](const TGroup* group) { return group->StateSortKey; }, ReverseSort);
11731183
break;
11741184
case EGroupFields::Latency:
11751185
SortCollection(GroupView, [](const TGroup* group) { return group->GetLatencyForSort(); }, ReverseSort);
@@ -1207,8 +1217,10 @@ class TStorageGroups : public TViewerPipeClient {
12071217
ApplyLimit();
12081218
}
12091219

1220+
bool CollectedHiveData = false;
1221+
12101222
void CollectHiveData() {
1211-
if (FieldsNeeded(FieldsHive)) {
1223+
if (!CollectedHiveData) {
12121224
if (!GroupView.empty()) {
12131225
ui64 hiveId = AppData()->DomainsInfo->GetHive();
12141226
if (hiveId != TDomainsInfo::BadTabletId) {
@@ -1226,6 +1238,7 @@ class TStorageGroups : public TViewerPipeClient {
12261238
++NavigateKeySetInFlight;
12271239
}
12281240
}
1241+
CollectedHiveData = true;
12291242
}
12301243
}
12311244

@@ -1341,7 +1354,6 @@ class TStorageGroups : public TViewerPipeClient {
13411354
}
13421355
FieldsAvailable |= FieldsBsPools;
13431356
ApplyEverything();
1344-
CollectHiveData();
13451357
} else {
13461358
AddProblem("bsc-storage-pools-no-data");
13471359
}
@@ -1427,6 +1439,9 @@ class TStorageGroups : public TViewerPipeClient {
14271439
}
14281440
}
14291441
if (AreBSControllerRequestsDone()) {
1442+
if (FieldsNeeded(FieldsHive) && !CollectedHiveData) {
1443+
CollectHiveData();
1444+
}
14301445
if (FieldsAvailable.test(+EGroupFields::GroupId) && FieldsNeeded(FieldsHive) && NavigateKeySetInFlight == 0 && HiveStorageStatsInFlight == 0) {
14311446
if (GroupsByGroupId.empty()) {
14321447
RebuildGroupsByGroupId();
@@ -2076,8 +2091,16 @@ class TStorageGroups : public TViewerPipeClient {
20762091
if (FieldsAvailable.test(+EGroupFields::PoolName)) {
20772092
jsonGroup.SetPoolName(group->PoolName);
20782093
}
2079-
for (const TVDisk& vdisk : group->VDisks) {
2080-
RenderVDisk(*jsonGroup.AddVDisks(), vdisk);
2094+
std::vector<const TVDisk*> vdisks;
2095+
vdisks.resize(group->VDisks.size());
2096+
for (size_t idx = 0; idx < group->VDisks.size(); ++idx) {
2097+
vdisks[idx] = &group->VDisks[idx];
2098+
}
2099+
std::sort(vdisks.begin(), vdisks.end(), [](const TVDisk* a, const TVDisk* b) {
2100+
return a->VDiskId < b->VDiskId;
2101+
});
2102+
for (const TVDisk* vdisk : vdisks) {
2103+
RenderVDisk(*jsonGroup.AddVDisks(), *vdisk);
20812104
}
20822105
if (FieldsAvailable.test(+EGroupFields::Encryption)) {
20832106
jsonGroup.SetEncryption(group->EncryptionMode);

‎ydb/core/viewer/viewer_cluster.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@ class TJsonCluster : public TViewerPipeClient {
365365
NodeBatches.emplace(nodeId, batch);
366366
++WhiteboardStateRequestsInFlight;
367367
}
368-
if (batch.HasStaticNodes && TabletViewerResponse.count(nodeId) == 0) {
368+
if (Tablets && batch.HasStaticNodes && TabletViewerResponse.count(nodeId) == 0) {
369369
auto viewerRequest = std::make_unique<TEvViewer::TEvViewerRequest>();
370370
InitTabletWhiteboardRequest(viewerRequest->Record.MutableTabletRequest());
371371
viewerRequest->Record.SetTimeout(Timeout / 2);
@@ -392,7 +392,7 @@ class TJsonCluster : public TViewerPipeClient {
392392
SystemStateResponse.emplace(nodeId, MakeWhiteboardRequest(nodeId, request));
393393
++WhiteboardStateRequestsInFlight;
394394
}
395-
if (node->Static) {
395+
if (Tablets && node->Static) {
396396
if (TabletStateResponse.count(nodeId) == 0) {
397397
auto request = std::make_unique<TEvWhiteboard::TEvTabletStateRequest>();
398398
TabletStateResponse.emplace(nodeId, MakeWhiteboardRequest(nodeId, request.release()));

‎ydb/core/viewer/viewer_nodes.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1030,6 +1030,7 @@ class TJsonNodes : public TViewerPipeClient {
10301030
for (const TString& word : filterWords) {
10311031
if (node->GetHostName().Contains(word) || ::ToString(node->GetNodeId()).Contains(word)) {
10321032
nodeView.push_back(node);
1033+
break;
10331034
}
10341035
}
10351036
}

‎ydb/core/viewer/viewer_tenantinfo.h‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -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

Comments
 (0)