Skip to content

added QuotaStorage to tenantinfo response #3463

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
Apr 10, 2024
Merged

added QuotaStorage to tenantinfo response #3463

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

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions ydb/core/viewer/json_tenantinfo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -628,13 +628,23 @@ class TJsonTenantInfo : public TViewerPipeClient<TJsonTenantInfo> {
tenant.SetStorageAllocatedLimit(storageAllocatedLimit);
tenant.SetStorageMinAvailableSize(storageMinAvailableSize);
tenant.SetStorageGroups(storageGroups);

auto& ssdUsage = *tenant.AddStorageUsage();
ssdUsage.SetType(NKikimrViewer::TStorageUsage::SSD);
ssdUsage.SetSize(storageAllocatedSize);
ssdUsage.SetLimit(storageAllocatedLimit);
// TODO(andrew-rykov)
auto& hddUsage = *tenant.AddStorageUsage();
hddUsage.SetType(NKikimrViewer::TStorageUsage::HDD);

if (tenant.databasequotas().data_size_hard_quota()) {
auto& ssdQuotaUsage = *tenant.AddQuotaUsage();
ssdQuotaUsage.SetType(NKikimrViewer::TStorageUsage::SSD);
ssdQuotaUsage.SetSize(tenant.GetMetrics().GetStorage());
ssdQuotaUsage.SetLimit(tenant.databasequotas().data_size_hard_quota());
auto& hddQuotaUsage = *tenant.AddQuotaUsage();
hddQuotaUsage.SetType(NKikimrViewer::TStorageUsage::HDD);
}
}
}

Expand Down
1 change: 1 addition & 0 deletions ydb/core/viewer/protos/viewer.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,6 +375,7 @@ message TTenant {
uint64 StorageAllocatedLimit = 41;
Ydb.Cms.DatabaseQuotas DatabaseQuotas = 42;
repeated TStorageUsage StorageUsage = 43;
repeated TStorageUsage QuotaUsage = 44;
}

message TTenants {
Expand Down