Skip to content

Commit a9e8f00

Browse files
MyCodeIsAmazingMyCodeIsAmazing
authored
Merge 18ab692 into 5e2e7ea 
2 parents 5e2e7ea + 18ab692 commit a9e8f00

File tree

3 files changed

+202
-9
lines changed

3 files changed

+202
-9
lines changed

‎ydb/core/viewer/json_storage.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ class TJsonStorage : public TJsonStorageBase {
250250
}
251251

252252
bool CheckGroupFilters(const TString& groupId, const TString& poolName, const TGroupRow& groupRow) {
253-
if (!EffectiveFilterGroupIds.empty() && !EffectiveFilterGroupIds.contains(groupId)) {
253+
if (!EffectiveGroupFilter.contains(groupId)) {
254254
return false;
255255
}
256256
switch (With) {
@@ -497,6 +497,7 @@ struct TJsonRequestParameters<TJsonStorage> {
497497
{"name":"tenant","in":"query","description":"tenant name","required":false,"type":"string"},
498498
{"name":"pool","in":"query","description":"storage pool name","required":false,"type":"string"},
499499
{"name":"node_id","in":"query","description":"node id","required":false,"type":"integer"},
500+
{"name":"pdisk_id","in":"query","description":"pdisk id","required":false,"type":"integer"},
500501
{"name":"group_id","in":"query","description":"group id","required":false,"type":"integer"},
501502
{"name":"need_groups","in":"query","description":"return groups information","required":false,"type":"boolean","default":true},
502503
{"name":"need_disks","in":"query","description":"return disks information","required":false,"type":"boolean","default":true},

‎ydb/core/viewer/json_storage_base.h‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,11 @@ class TJsonStorageBase : public TViewerPipeClient<TJsonStorageBase> {
7272
ui32 Timeout = 0;
7373
TString FilterTenant;
7474
THashSet<TString> FilterStoragePools;
75-
TVector<TString> FilterGroupIds;
7675
TString Filter;
76+
std::unordered_set<TString> FilterGroupIds;
7777
std::unordered_set<TNodeId> FilterNodeIds;
78-
THashSet<TString> EffectiveFilterGroupIds;
78+
std::unordered_set<TNodeId> FilterPDiskIds;
79+
THashSet<TString> EffectiveGroupFilter;
7980
std::unordered_set<TNodeId> NodeIds;
8081
bool NeedAdditionalNodesRequests;
8182

@@ -133,9 +134,9 @@ class TJsonStorageBase : public TViewerPipeClient<TJsonStorageBase> {
133134
FilterStoragePools.emplace(filterStoragePool);
134135
}
135136
SplitIds(params.Get("node_id"), ',', FilterNodeIds);
137+
SplitIds(params.Get("pdisk_id"), ',', FilterPDiskIds);
136138
NeedAdditionalNodesRequests = !FilterNodeIds.empty();
137139
SplitIds(params.Get("group_id"), ',', FilterGroupIds);
138-
Sort(FilterGroupIds);
139140
Filter = params.Get("filter");
140141
if (params.Get("with") == "missing") {
141142
With = EWith::MissingDisks;
@@ -356,6 +357,12 @@ class TJsonStorageBase : public TViewerPipeClient<TJsonStorageBase> {
356357
for (auto& vDiskStateInfo : *(vDiskInfo.MutableVDiskStateInfo())) {
357358
vDiskStateInfo.SetNodeId(nodeId);
358359
VDiskId2vDiskStateInfo[VDiskIDFromVDiskID(vDiskStateInfo.GetVDiskId())] = &vDiskStateInfo;
360+
361+
if ((FilterNodeIds.empty() || FilterNodeIds.contains(nodeId))
362+
&& (FilterPDiskIds.empty() || FilterPDiskIds.contains(vDiskStateInfo.GetPDiskId()))
363+
&& (FilterGroupIds.empty() || FilterGroupIds.contains(ToString(vDiskStateInfo.GetVDiskId().GetGroupID())))) {
364+
EffectiveGroupFilter.insert(ToString(vDiskStateInfo.GetVDiskId().GetGroupID()));
365+
}
359366
}
360367
RequestDone();
361368
}
@@ -375,10 +382,6 @@ class TJsonStorageBase : public TViewerPipeClient<TJsonStorageBase> {
375382
}
376383
if (FilterNodeIds.empty() || FilterNodeIds.contains(info.GetNodeId())) {
377384
StoragePoolInfo[storagePoolName].Groups.emplace(ToString(info.GetGroupID()));
378-
TString groupId(ToString(info.GetGroupID()));
379-
if (FilterGroupIds.empty() || BinarySearch(FilterGroupIds.begin(), FilterGroupIds.end(), groupId)) {
380-
EffectiveFilterGroupIds.insert(groupId);
381-
}
382385
}
383386
for (const auto& vDiskNodeId : info.GetVDiskNodeIds()) {
384387
Group2NodeId[info.GetGroupID()].push_back(vDiskNodeId);

‎ydb/core/viewer/viewer_ut.cpp‎

Lines changed: 190 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,8 +272,8 @@ Y_UNIT_TEST_SUITE(Viewer) {
272272

273273
auto sample = nodes[0];
274274
nodes.clear();
275-
276275
for (int nodeId = 0; nodeId < nodesTotal; nodeId++) {
276+
sample.NodeId = nodeId;
277277
nodes.emplace_back(sample);
278278
}
279279
}
@@ -1317,4 +1317,193 @@ Y_UNIT_TEST_SUITE(Viewer) {
13171317
"description",
13181318
});
13191319
}
1320+
1321+
void ChangeBSGroupStateResponse(TEvWhiteboard::TEvBSGroupStateResponse::TPtr* ev) {
1322+
ui64 nodeId = (*ev)->Cookie;
1323+
auto& pbRecord = (*ev)->Get()->Record;
1324+
1325+
pbRecord.clear_bsgroupstateinfo();
1326+
1327+
for (ui64 groupId = 1; groupId <= 9; groupId++) {
1328+
if (groupId == nodeId) {
1329+
continue;
1330+
}
1331+
auto state = pbRecord.add_bsgroupstateinfo();
1332+
state->set_groupid(groupId);
1333+
state->set_storagepoolname("/Root:test");
1334+
state->set_nodeid(nodeId);
1335+
for (int k = 1; k <= 8; k++) {
1336+
auto vdisk = groupId * 8 + k;
1337+
auto vdiskId = state->add_vdiskids();
1338+
vdiskId->set_groupid(groupId);
1339+
vdiskId->set_groupgeneration(1);
1340+
vdiskId->set_vdisk(vdisk);
1341+
}
1342+
}
1343+
}
1344+
1345+
void ChangePDiskStateResponse(TEvWhiteboard::TEvPDiskStateResponse::TPtr* ev) {
1346+
auto& pbRecord = (*ev)->Get()->Record;
1347+
pbRecord.clear_pdiskstateinfo();
1348+
for (int k = 0; k < 2; k++) {
1349+
auto state = pbRecord.add_pdiskstateinfo();
1350+
state->set_pdiskid(k);
1351+
}
1352+
}
1353+
1354+
void ChangeVDiskStateOn9NodeResponse(NNodeWhiteboard::TEvWhiteboard::TEvVDiskStateResponse::TPtr* ev) {
1355+
ui64 nodeId = (*ev)->Cookie;
1356+
auto& pbRecord = (*ev)->Get()->Record;
1357+
1358+
pbRecord.clear_vdiskstateinfo();
1359+
1360+
for (int k = 0; k < 8; k++) {
1361+
auto groupId = (nodeId + k) % 9 + 1;
1362+
auto vdisk = groupId * 8 + k + 1;
1363+
ui32 pdisk = k / 4;
1364+
ui32 slotid = k % 4;
1365+
auto state = pbRecord.add_vdiskstateinfo();
1366+
state->set_pdiskid(pdisk);
1367+
state->set_vdiskslotid(slotid);
1368+
state->mutable_vdiskid()->set_groupid(groupId);
1369+
state->mutable_vdiskid()->set_groupgeneration(1);
1370+
state->mutable_vdiskid()->set_vdisk(vdisk++);
1371+
state->set_vdiskstate(NKikimrWhiteboard::EVDiskState::OK);
1372+
state->set_nodeid(nodeId);
1373+
}
1374+
}
1375+
1376+
void AddGroupsInControllerSelectGroupsResult(TEvBlobStorage::TEvControllerSelectGroupsResult::TPtr* ev, int groupCount) {
1377+
auto& pbRecord = (*ev)->Get()->Record;
1378+
auto pbMatchGroups = pbRecord.mutable_matchinggroups(0);
1379+
1380+
auto sample = pbMatchGroups->groups(0);
1381+
pbMatchGroups->ClearGroups();
1382+
1383+
for (int groupId = 1; groupId <= groupCount; groupId++) {
1384+
auto group = pbMatchGroups->add_groups();
1385+
group->CopyFrom(sample);
1386+
group->set_groupid(groupId++);
1387+
group->set_storagepoolname("/Root:test");
1388+
}
1389+
};
1390+
1391+
void JsonStorage9Nodes9GroupsListingTest(TString version, bool groupFilter, bool nodeFilter, bool pdiskFilter, ui32 expectedFoundGroups, ui32 expectedTotalGroups) {
1392+
TPortManager tp;
1393+
ui16 port = tp.GetPort(2134);
1394+
ui16 grpcPort = tp.GetPort(2135);
1395+
auto settings = TServerSettings(port);
1396+
settings.InitKikimrRunConfig()
1397+
.SetNodeCount(9)
1398+
.SetUseRealThreads(false)
1399+
.SetDomainName("Root");
1400+
TServer server(settings);
1401+
server.EnableGRpc(grpcPort);
1402+
TClient client(settings);
1403+
TTestActorRuntime& runtime = *server.GetRuntime();
1404+
1405+
TActorId sender = runtime.AllocateEdgeActor();
1406+
TAutoPtr<IEventHandle> handle;
1407+
1408+
THttpRequest httpReq(HTTP_METHOD_GET);
1409+
httpReq.CgiParameters.emplace("with", "all");
1410+
httpReq.CgiParameters.emplace("version", version);
1411+
if (groupFilter) {
1412+
httpReq.CgiParameters.emplace("group_id", "1");
1413+
}
1414+
if (nodeFilter) {
1415+
httpReq.CgiParameters.emplace("node_id", "1");
1416+
}
1417+
if (pdiskFilter) {
1418+
httpReq.CgiParameters.emplace("pdisk_id", "0");
1419+
}
1420+
auto page = MakeHolder<TMonPage>("viewer", "title");
1421+
TMonService2HttpRequest monReq(nullptr, &httpReq, nullptr, page.Get(), "/json/storage", nullptr);
1422+
auto request = MakeHolder<NMon::TEvHttpInfo>(monReq);
1423+
1424+
auto observerFunc = [&](TAutoPtr<IEventHandle>& ev) {
1425+
Y_UNUSED(ev);
1426+
switch (ev->GetTypeRewrite()) {
1427+
case NConsole::TEvConsole::EvListTenantsResponse: {
1428+
auto *x = reinterpret_cast<NConsole::TEvConsole::TEvListTenantsResponse::TPtr*>(&ev);
1429+
Ydb::Cms::ListDatabasesResult listTenantsResult;
1430+
(*x)->Get()->Record.GetResponse().operation().result().UnpackTo(&listTenantsResult);
1431+
listTenantsResult.Addpaths("/Root");
1432+
(*x)->Get()->Record.MutableResponse()->mutable_operation()->mutable_result()->PackFrom(listTenantsResult);
1433+
break;
1434+
}
1435+
case TEvWhiteboard::EvBSGroupStateResponse: {
1436+
auto *x = reinterpret_cast<TEvWhiteboard::TEvBSGroupStateResponse::TPtr*>(&ev);
1437+
ChangeBSGroupStateResponse(x);
1438+
break;
1439+
}
1440+
case TEvWhiteboard::EvVDiskStateResponse: {
1441+
auto *x = reinterpret_cast<TEvWhiteboard::TEvVDiskStateResponse::TPtr*>(&ev);
1442+
ChangeVDiskStateOn9NodeResponse(x);
1443+
break;
1444+
}
1445+
case TEvWhiteboard::EvPDiskStateResponse: {
1446+
auto *x = reinterpret_cast<TEvWhiteboard::TEvPDiskStateResponse::TPtr*>(&ev);
1447+
ChangePDiskStateResponse(x);
1448+
break;
1449+
}
1450+
case TEvBlobStorage::EvControllerSelectGroupsResult: {
1451+
auto *x = reinterpret_cast<TEvBlobStorage::TEvControllerSelectGroupsResult::TPtr*>(&ev);
1452+
AddGroupsInControllerSelectGroupsResult(x, 9);
1453+
break;
1454+
}
1455+
}
1456+
1457+
return TTestActorRuntime::EEventAction::PROCESS;
1458+
};
1459+
runtime.SetObserverFunc(observerFunc);
1460+
1461+
runtime.Send(new IEventHandle(NKikimr::NViewer::MakeViewerID(0), sender, request.Release(), 0));
1462+
NMon::TEvHttpInfoRes* result = runtime.GrabEdgeEvent<NMon::TEvHttpInfoRes>(handle);
1463+
1464+
size_t pos = result->Answer.find('{');
1465+
TString jsonResult = result->Answer.substr(pos);
1466+
NJson::TJsonValue json;
1467+
try {
1468+
NJson::ReadJsonTree(jsonResult, &json, true);
1469+
}
1470+
catch (yexception ex) {
1471+
Ctest << ex.what() << Endl;
1472+
}
1473+
1474+
UNIT_ASSERT_VALUES_EQUAL(json.GetMap().at("FoundGroups"), ToString(expectedFoundGroups));
1475+
UNIT_ASSERT_VALUES_EQUAL(json.GetMap().at("TotalGroups"), ToString(expectedTotalGroups));
1476+
}
1477+
1478+
Y_UNIT_TEST(JsonStorageListingV1) {
1479+
JsonStorage9Nodes9GroupsListingTest("v1", false, false, false, 9, 9);
1480+
}
1481+
1482+
Y_UNIT_TEST(JsonStorageListingV2) {
1483+
JsonStorage9Nodes9GroupsListingTest("v2", false, false, false, 9, 9);
1484+
}
1485+
1486+
Y_UNIT_TEST(JsonStorageListingV1GroupIdFilter) {
1487+
JsonStorage9Nodes9GroupsListingTest("v1", true, false, false, 1, 9);
1488+
}
1489+
1490+
Y_UNIT_TEST(JsonStorageListingV2GroupIdFilter) {
1491+
JsonStorage9Nodes9GroupsListingTest("v2", true, false, false, 1, 9);
1492+
}
1493+
1494+
Y_UNIT_TEST(JsonStorageListingV1NodeIdFilter) {
1495+
JsonStorage9Nodes9GroupsListingTest("v1", false, true, false, 8, 8);
1496+
}
1497+
1498+
Y_UNIT_TEST(JsonStorageListingV2NodeIdFilter) {
1499+
JsonStorage9Nodes9GroupsListingTest("v2", false, true, false, 8, 8);
1500+
}
1501+
1502+
Y_UNIT_TEST(JsonStorageListingV1PDiskIdFilter) {
1503+
JsonStorage9Nodes9GroupsListingTest("v1", false, true, true, 4, 8);
1504+
}
1505+
1506+
Y_UNIT_TEST(JsonStorageListingV2PDiskIdFilter) {
1507+
JsonStorage9Nodes9GroupsListingTest("v2", false, true, true, 4, 8);
1508+
}
13201509
}

0 commit comments

Comments
 (0)