Skip to content

correctly check WB requests requirement, improve swagger description #7521

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 7, 2024
Merged

correctly check WB requests requirement, improve swagger description #7521

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 44 additions & 6 deletions ydb/core/viewer/storage_groups.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,6 @@ class TStorageGroups : public TViewerPipeClient {

// BSC
bool FallbackToWhiteboard = false;
bool FillDisksFromWhiteboard = false;
std::optional<TRequestResponse<NSysView::TEvSysView::TEvGetGroupsResponse>> GetGroupsResponse;
std::optional<TRequestResponse<NSysView::TEvSysView::TEvGetStoragePoolsResponse>> GetStoragePoolsResponse;
std::optional<TRequestResponse<NSysView::TEvSysView::TEvGetVSlotsResponse>> GetVSlotsResponse;
Expand Down Expand Up @@ -657,7 +656,6 @@ class TStorageGroups : public TViewerPipeClient {
FieldsRequired |= FieldsBsVSlots;
FieldsRequired |= FieldsBsPDisks;
}
FillDisksFromWhiteboard = FromStringWithDefault<bool>(params.Get("fill_disks_from_whiteboard"), FillDisksFromWhiteboard);
TString fieldsRequired = params.Get("fields_required");
if (!fieldsRequired.empty()) {
if (fieldsRequired == "all") {
Expand Down Expand Up @@ -1169,6 +1167,13 @@ class TStorageGroups : public TViewerPipeClient {
NKikimrBlobStorage::EVDiskStatus_Parse(info.GetStatusV2(), &vDisk.VDiskStatus);
}

bool AreBSControllerRequestsDone() const {
return (!GetGroupsResponse || GetGroupsResponse->IsDone()) &&
(!GetStoragePoolsResponse || GetStoragePoolsResponse->IsDone()) &&
(!GetVSlotsResponse || GetVSlotsResponse->IsDone()) &&
(!GetPDisksResponse || GetPDisksResponse->IsDone());
}

void ProcessBSControllerResponses() {
int requestsDone = 0;
if (GetGroupsResponse && GetGroupsResponse->IsOk() && FieldsNeeded(FieldsBsGroups)) {
Expand Down Expand Up @@ -1306,7 +1311,7 @@ class TStorageGroups : public TViewerPipeClient {
}
}
}
if (NoMoreRequests(requestsDone) && FieldsNeeded(FieldsWbDisks)) {
if (AreBSControllerRequestsDone() && FieldsNeeded(FieldsWbDisks)) {
for (TGroup& group : Groups) {
for (TNodeId nodeId : group.VDiskNodeIds) {
SendWhiteboardDisksRequest(nodeId);
Expand Down Expand Up @@ -1748,9 +1753,11 @@ class TStorageGroups : public TViewerPipeClient {
void HandleTimeout(TEvents::TEvWakeup::TPtr& ev) {
switch (ev->Get()->Tag) {
case TimeoutBSC:
OnBscError("timeout");
Problems.emplace_back("bsc-timeout");
RequestDone(FailPipeConnect(GetBSControllerId()));
if (!AreBSControllerRequestsDone()) {
OnBscError("timeout");
Problems.emplace_back("bsc-timeout");
RequestDone(FailPipeConnect(GetBSControllerId()));
}
break;
case TimeoutFinal:
// bread crumbs
Expand All @@ -1762,6 +1769,12 @@ class TStorageGroups : public TViewerPipeClient {
Problems.emplace_back("wb-incomplete-disks");
ProcessWhiteboardDisks();
}
if (HiveStorageStatsInFlight > 0) {
Problems.emplace_back("hive-incomplete");
}
if (!AreBSControllerRequestsDone()) {
Problems.emplace_back("bsc-incomplete");
}
ReplyAndPassAway();
break;
}
Expand Down Expand Up @@ -2019,6 +2032,31 @@ class TStorageGroups : public TViewerPipeClient {
* `State`
required: false
type: string
- name: fields_required
in: query
description: >
list of fields required in response (the more - the heavier could be request):
* `GroupId` (always required)
* `PoolName`
* `Kind`
* `MediaType`
* `Erasure`
* `MissingDisks`
* `State`
* `Usage`
* `Used`
* `Limit`
* `Usage`
* `Available`
* `DiskSpaceUsage`
* `Encryption`
* `AllocationUnits`
* `Read`
* `Write`
* `PDisk`
* `VDisk`
required: false
type: string
- name: offset
in: query
description: skip N nodes
Expand Down