Skip to content

Commit

Permalink
added pdisk filter
Browse files Browse the repository at this point in the history
  • Loading branch information
@StekPerepolnen
StekPerepolnen committed Apr 25, 2024
1 parent 72e47d6 commit 372ef51
Show file tree
Hide file tree
Showing 5 changed files with 121 additions and 51 deletions.
4 changes: 4 additions & 0 deletions ydb/core/testlib/actors/test_runtime.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,10 @@ namespace NActors {
return *node->GetAppData<NKikimr::TAppData>();
}

ui32 TTestActorRuntime::GetFirstNodeId() {
return FirstNodeId;
}

bool TTestActorRuntime::DefaultScheduledFilterFunc(TTestActorRuntimeBase& runtime, TAutoPtr<IEventHandle>& event, TDuration delay, TInstant& deadline) {
Y_UNUSED(delay);
Y_UNUSED(deadline);
Expand Down
1 change: 1 addition & 0 deletions ydb/core/testlib/actors/test_runtime.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ namespace NActors {
void ClosePipe(TActorId clientId, const TActorId& sender, ui32 nodeIndex);
void DisconnectNodes(ui32 fromNodeIndex, ui32 toNodeIndex, bool async = true);
NKikimr::TAppData& GetAppData(ui32 nodeIndex = 0);
ui32 GetFirstNodeId();

TPortManager& GetPortManager() {
return *this;
Expand Down
4 changes: 2 additions & 2 deletions ydb/core/viewer/json_storage.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,6 @@ class TJsonStorage : public TJsonStorageBase {
}

void Bootstrap() override {
Cerr << "iiiii Bootstrap" << Endl;
TIntrusivePtr<TDomainsInfo> domains = AppData()->DomainsInfo;
ui64 hiveId = domains->GetHive();
if (hiveId != TDomainsInfo::BadTabletId) {
Expand Down Expand Up @@ -251,7 +250,7 @@ class TJsonStorage : public TJsonStorageBase {
}

bool CheckGroupFilters(const TString& groupId, const TString& poolName, const TGroupRow& groupRow) {
if (!EffectiveFilterGroupIds.empty() && !EffectiveFilterGroupIds.contains(groupId)) {
if (!EffectiveGroupFilter.contains(groupId)) {
return false;
}
switch (With) {
Expand Down Expand Up @@ -498,6 +497,7 @@ struct TJsonRequestParameters<TJsonStorage> {
{"name":"tenant","in":"query","description":"tenant name","required":false,"type":"string"},
{"name":"pool","in":"query","description":"storage pool name","required":false,"type":"string"},
{"name":"node_id","in":"query","description":"node id","required":false,"type":"integer"},
{"name":"pdisk_id","in":"query","description":"pdisk id","required":false,"type":"integer"},
{"name":"group_id","in":"query","description":"group id","required":false,"type":"integer"},
{"name":"need_groups","in":"query","description":"return groups information","required":false,"type":"boolean","default":true},
{"name":"need_disks","in":"query","description":"return disks information","required":false,"type":"boolean","default":true},
Expand Down
26 changes: 11 additions & 15 deletions ydb/core/viewer/json_storage_base.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,11 @@ class TJsonStorageBase : public TViewerPipeClient<TJsonStorageBase> {
ui32 Timeout = 0;
TString FilterTenant;
THashSet<TString> FilterStoragePools;
TVector<TString> FilterGroupIds;
TString Filter;
std::unordered_set<TString> FilterGroupIds;
std::unordered_set<TNodeId> FilterNodeIds;
THashSet<TString> EffectiveFilterGroupIds;
std::unordered_set<TNodeId> FilterPDiskIds;
THashSet<TString> EffectiveGroupFilter;
std::unordered_set<TNodeId> NodeIds;
bool NeedAdditionalNodesRequests;

Expand Down Expand Up @@ -133,9 +134,9 @@ class TJsonStorageBase : public TViewerPipeClient<TJsonStorageBase> {
FilterStoragePools.emplace(filterStoragePool);
}
SplitIds(params.Get("node_id"), ',', FilterNodeIds);
SplitIds(params.Get("pdisk_id"), ',', FilterPDiskIds);
NeedAdditionalNodesRequests = !FilterNodeIds.empty();
SplitIds(params.Get("group_id"), ',', FilterGroupIds);
Sort(FilterGroupIds);
Filter = params.Get("filter");
if (params.Get("with") == "missing") {
With = EWith::MissingDisks;
Expand Down Expand Up @@ -263,7 +264,6 @@ class TJsonStorageBase : public TViewerPipeClient<TJsonStorageBase> {
}

void Handle(TEvInterconnect::TEvNodesInfo::TPtr& ev) {
Cerr << "iiiiiiiiii TEvNodesInfo 1" << Endl;
ui32 maxAllowedNodeId = std::numeric_limits<ui32>::max();
TIntrusivePtr<TDynamicNameserviceConfig> dynamicNameserviceConfig = AppData()->DynamicNameserviceConfig;
if (dynamicNameserviceConfig) {
Expand All @@ -275,7 +275,6 @@ class TJsonStorageBase : public TViewerPipeClient<TJsonStorageBase> {
SendNodeRequests(ni.NodeId);
}
}
Cerr << "iiiiiiiiii TEvNodesInfo 2" << Endl;
RequestDone();
}

Expand Down Expand Up @@ -314,7 +313,6 @@ class TJsonStorageBase : public TViewerPipeClient<TJsonStorageBase> {
}

void Handle(TEvHive::TEvResponseHiveStorageStats::TPtr& ev) {
Cerr << "iiiii TEvResponseHiveStorageStats" << Endl;
HiveStorageStats[ev->Cookie] = ev->Release();
RequestDone();
}
Expand Down Expand Up @@ -354,13 +352,18 @@ class TJsonStorageBase : public TViewerPipeClient<TJsonStorageBase> {
}

void Handle(TEvWhiteboard::TEvVDiskStateResponse::TPtr& ev) {
Cerr << "iiiii TEvVDiskStateResponse" << Endl;
ui64 nodeId = ev.Get()->Cookie;
Cerr << "iiiii nodeid" << nodeId << Endl;
auto& vDiskInfo = VDiskInfo[nodeId] = std::move(ev->Get()->Record);
for (auto& vDiskStateInfo : *(vDiskInfo.MutableVDiskStateInfo())) {
vDiskStateInfo.SetNodeId(nodeId);
VDiskId2vDiskStateInfo[VDiskIDFromVDiskID(vDiskStateInfo.GetVDiskId())] = &vDiskStateInfo;

if ((FilterNodeIds.empty() || FilterNodeIds.contains(nodeId))
&& (FilterPDiskIds.empty() || FilterPDiskIds.contains(vDiskStateInfo.GetPDiskId()))
&& (FilterGroupIds.empty() || FilterGroupIds.contains(ToString(vDiskStateInfo.GetVDiskId().GetGroupID())))) {

EffectiveGroupFilter.insert(ToString(vDiskStateInfo.GetVDiskId().GetGroupID()));
}
}
RequestDone();
}
Expand All @@ -373,22 +376,15 @@ class TJsonStorageBase : public TViewerPipeClient<TJsonStorageBase> {

void Handle(TEvWhiteboard::TEvBSGroupStateResponse::TPtr& ev) {
ui64 nodeId = ev.Get()->Cookie;
Cerr << "iiiiiiiiiiiii Cookie " << nodeId << Endl;
for (const auto& info : ev->Get()->Record.GetBSGroupStateInfo()) {
TString storagePoolName = info.GetStoragePoolName();
if (storagePoolName.empty()) {
continue;
}
Cerr << "iiiiiiiiiiiii nodeId " << info.GetNodeId() << Endl;
if (FilterNodeIds.empty() || FilterNodeIds.contains(info.GetNodeId())) {
StoragePoolInfo[storagePoolName].Groups.emplace(ToString(info.GetGroupID()));
TString groupId(ToString(info.GetGroupID()));
if (FilterGroupIds.empty() || BinarySearch(FilterGroupIds.begin(), FilterGroupIds.end(), groupId)) {
EffectiveFilterGroupIds.insert(groupId);
}
}
for (const auto& vDiskNodeId : info.GetVDiskNodeIds()) {
Cerr << "iiiiiiiiiiiii vDiskNodeId " << vDiskNodeId << Endl;
Group2NodeId[info.GetGroupID()].push_back(vDiskNodeId);
}
}
Expand Down
137 changes: 103 additions & 34 deletions ydb/core/viewer/viewer_ut.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,6 @@ Y_UNIT_TEST_SUITE(Viewer) {
nodes.clear();

for (int nodeId = 0; nodeId < nodesTotal; nodeId++) {
sample.NodeId = nodeId;
nodes.emplace_back(sample);
}
}
Expand Down Expand Up @@ -1320,50 +1319,82 @@ Y_UNIT_TEST_SUITE(Viewer) {
}

void ChangeBSGroupStateResponse(TEvWhiteboard::TEvBSGroupStateResponse::TPtr* ev) {
ui64 nodeId = (*ev)->Cookie;
auto& pbRecord = (*ev)->Get()->Record;
// pbRecord.clear_bsgroupstateinfo();
// auto state = pbRecord.add_bsgroupstateinfo();
Cerr << pbRecord.ShortDebugString() << Endl;

pbRecord.clear_bsgroupstateinfo();

for (ui64 groupId = 1; groupId <= 9; groupId++) {
if (groupId % 9 == nodeId % 9) {
continue;
}
auto state = pbRecord.add_bsgroupstateinfo();
state->set_groupid(groupId);
state->set_storagepoolname("/Root:test");
state->set_nodeid(nodeId);
for (int k = 1; k <= 8; k++) {
auto vdisk = groupId * 8 + k;
auto vdiskId = state->add_vdiskids();
vdiskId->set_groupid(groupId);
vdiskId->set_groupgeneration(1);
vdiskId->set_vdisk(vdisk);
}
}
}

void ChangePDiskStateResponse(TEvWhiteboard::TEvPDiskStateResponse::TPtr* ev) {
auto& pbRecord = (*ev)->Get()->Record;
// pbRecord.clear_pdiskstateinfo();
// auto state = pbRecord.add_pdiskstateinfo();
Cerr << pbRecord.ShortDebugString() << Endl;
pbRecord.clear_pdiskstateinfo();
for (int k = 0; k < 2; k++) {
auto state = pbRecord.add_pdiskstateinfo();
state->set_pdiskid(k);
}
}


void ChangeVDiskStateOn9NodeResponse(NNodeWhiteboard::TEvWhiteboard::TEvVDiskStateResponse::TPtr* ev) {
ui64 nodeId = (*ev)->Cookie;
auto& pbRecord = (*ev)->Get()->Record;

auto sample = pbRecord.vdiskstateinfo(0);
pbRecord.clear_vdiskstateinfo();

for (int k = 1; k <= 8; k++) {
auto groupId = (nodeId + k) % 9;
ui32 pdisk = k <= 4 ? 0 : 1;
for (int k = 0; k < 8; k++) {
auto groupId = (nodeId + k) % 9 + 1;
auto vdisk = groupId * 8 + k + 1;
ui32 pdisk = k / 4;
ui32 slotid = k % 4;
auto vdisk = 0;
auto state = pbRecord.add_vdiskstateinfo();
state->CopyFrom(sample);
state->set_pdiskid(pdisk);
state->set_vdiskslotid(slotid);
state->mutable_vdiskid()->set_vdisk(vdisk++);
state->mutable_vdiskid()->set_groupid(groupId);
state->mutable_vdiskid()->set_groupgeneration(1);
state->mutable_vdiskid()->set_vdisk(vdisk++);
state->set_vdiskstate(NKikimrWhiteboard::EVDiskState::OK);
state->set_nodeid(nodeId);
}
}

void JsonStorage9NodesListingTest() {
void AddGroupsInControllerSelectGroupsResult(TEvBlobStorage::TEvControllerSelectGroupsResult::TPtr* ev, int groupCount) {
auto& pbRecord = (*ev)->Get()->Record;
auto pbMatchGroups = pbRecord.mutable_matchinggroups(0);

auto sample = pbMatchGroups->groups(0);
pbMatchGroups->ClearGroups();

for (int groupId = 1; groupId <= groupCount; groupId++) {
auto group = pbMatchGroups->add_groups();
group->CopyFrom(sample);
group->set_groupid(groupId++);
group->set_storagepoolname("/Root:test");
}
};

void JsonStorage9Nodes9GroupsListingTest(TString version, bool groupFilter, bool nodeFilter, bool pdiskFilter, ui32 expectedFoundGroups, ui32 expectedTotalGroups) {
TPortManager tp;
ui16 port = tp.GetPort(2134);
ui16 grpcPort = tp.GetPort(2135);
auto settings = TServerSettings(port);
settings.InitKikimrRunConfig()
.SetNodeCount(1)
.SetNodeCount(9)
.SetUseRealThreads(false)
.SetDomainName("Root");
TServer server(settings);
Expand All @@ -1376,41 +1407,49 @@ Y_UNIT_TEST_SUITE(Viewer) {

THttpRequest httpReq(HTTP_METHOD_GET);
httpReq.CgiParameters.emplace("with", "all");
httpReq.CgiParameters.emplace("version", "v2");
// httpReq.CgiParameters.emplace("node_id", "1");
httpReq.CgiParameters.emplace("version", version);
if (groupFilter) {
httpReq.CgiParameters.emplace("group_id", "1");
}
if (nodeFilter) {
httpReq.CgiParameters.emplace("node_id", ToString(runtime.GetFirstNodeId()));
}
if (pdiskFilter) {
httpReq.CgiParameters.emplace("pdisk_id", "0");
}
auto page = MakeHolder<TMonPage>("viewer", "title");
TMonService2HttpRequest monReq(nullptr, &httpReq, nullptr, page.Get(), "/json/storage", nullptr);
auto request = MakeHolder<NMon::TEvHttpInfo>(monReq);

auto observerFunc = [&](TAutoPtr<IEventHandle>& ev) {
Y_UNUSED(ev);
switch (ev->GetTypeRewrite()) {
case TEvInterconnect::EvNodesInfo: {
auto *x = reinterpret_cast<TEvInterconnect::TEvNodesInfo::TPtr*>(&ev);
Cerr << "aaaa EvNodesInfo 1" << Endl;
ChangeListNodes(x, 9);
Cerr << "aaaa EvNodesInfo 2" << Endl;
case NConsole::TEvConsole::EvListTenantsResponse: {
auto *x = reinterpret_cast<NConsole::TEvConsole::TEvListTenantsResponse::TPtr*>(&ev);
Ydb::Cms::ListDatabasesResult listTenantsResult;
(*x)->Get()->Record.GetResponse().operation().result().UnpackTo(&listTenantsResult);
listTenantsResult.Addpaths("/Root");
(*x)->Get()->Record.MutableResponse()->mutable_operation()->mutable_result()->PackFrom(listTenantsResult);
break;
}
case TEvWhiteboard::EvBSGroupStateResponse: {
auto *x = reinterpret_cast<TEvWhiteboard::TEvBSGroupStateResponse::TPtr*>(&ev);
Cerr << "aaaa EvBSGroupStateResponse 1" << Endl;
ChangeBSGroupStateResponse(x);
Cerr << "aaaa EvBSGroupStateResponse 2" << Endl;
break;
}
case TEvWhiteboard::EvVDiskStateResponse: {
auto *x = reinterpret_cast<TEvWhiteboard::TEvVDiskStateResponse::TPtr*>(&ev);
Cerr << "aaaa EvVDiskStateResponse 1" << Endl;
ChangeVDiskStateOn9NodeResponse(x);
Cerr << "aaaa EvVDiskStateResponse 2" << Endl;
break;
}
case TEvWhiteboard::EvPDiskStateResponse: {
auto *x = reinterpret_cast<TEvWhiteboard::TEvPDiskStateResponse::TPtr*>(&ev);
Cerr << "aaaa EvPDiskStateResponse 1" << Endl;
ChangePDiskStateResponse(x);
Cerr << "aaaa EvPDiskStateResponse 2" << Endl;
break;
}
case TEvBlobStorage::EvControllerSelectGroupsResult: {
auto *x = reinterpret_cast<TEvBlobStorage::TEvControllerSelectGroupsResult::TPtr*>(&ev);
AddGroupsInControllerSelectGroupsResult(x, 9);
break;
}
}
Expand All @@ -1424,18 +1463,48 @@ Y_UNIT_TEST_SUITE(Viewer) {

size_t pos = result->Answer.find('{');
TString jsonResult = result->Answer.substr(pos);
Cerr << "json result: " << jsonResult << Endl;
NJson::TJsonValue json;
try {
NJson::ReadJsonTree(jsonResult, &json, true);
}
catch (yexception ex) {
Ctest << ex.what() << Endl;
}
// UNIT_ASSERT_VALUES_EQUAL(json.GetMap().contains("StorageGroups"), isExpectingGroup);

UNIT_ASSERT_VALUES_EQUAL(json.GetMap().at("FoundGroups"), ToString(expectedFoundGroups));
UNIT_ASSERT_VALUES_EQUAL(json.GetMap().at("TotalGroups"), ToString(expectedTotalGroups));
}

Y_UNIT_TEST(JsonStorageListingV1) {
JsonStorage9Nodes9GroupsListingTest("v1", false, false, false, 9, 9);
}

Y_UNIT_TEST(JsonStorageListingV2) {
JsonStorage9Nodes9GroupsListingTest("v2", false, false, false, 9, 9);
}

Y_UNIT_TEST(JsonStorageListingV1GroupIdFilter) {
JsonStorage9Nodes9GroupsListingTest("v1", true, false, false, 1, 9);
}

Y_UNIT_TEST(JsonStorageListingV2GroupIdFilter) {
JsonStorage9Nodes9GroupsListingTest("v2", true, false, false, 1, 9);
}

Y_UNIT_TEST(JsonStorageListingV1NodeIdFilter) {
JsonStorage9Nodes9GroupsListingTest("v1", false, true, false, 8, 8);
}

Y_UNIT_TEST(JsonStorageListingV2NodeIdFilter) {
JsonStorage9Nodes9GroupsListingTest("v2", false, true, false, 8, 8);
}

Y_UNIT_TEST(JsonStorageListingV1PDiskIdFilter) {
JsonStorage9Nodes9GroupsListingTest("v1", false, true, true, 4, 8);
JsonStorage9Nodes9GroupsListingTest("v1", false, true, true, 4, 8);
}

Y_UNIT_TEST(JsonStorage9NodesListingV1NodeIdFilter) {
JsonStorage9NodesListingTest();
Y_UNIT_TEST(JsonStorageListingV2PDiskIdFilter) {
JsonStorage9Nodes9GroupsListingTest("v2", false, true, true, 4, 8);
}
}

0 comments on commit 372ef51

Please sign in to comment.