nodes-added-pdiskid-filter

ydb-platform · Apr 5, 2024 · 802283c · 802283c
1 parent 77c6779
commit 802283c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/ydb/core/viewer/json_tenantinfo.h b/ydb/core/viewer/json_tenantinfo.h
@@ -628,10 +628,16 @@ 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);
+                        if (tenant.databasequotas().data_size_hard_quota() && tenant.GetMetrics().GetStorage()) {
+                            ssdUsage.SetSize(tenant.GetMetrics().GetStorage());
+                            ssdUsage.SetLimit(tenant.databasequotas().data_size_hard_quota());
+                        } else {
+                            ssdUsage.SetSize(storageAllocatedSize);
+                            ssdUsage.SetLimit(storageAllocatedLimit);
+                        }
                         // TODO(andrew-rykov)
                         auto& hddUsage = *tenant.AddStorageUsage();
                         hddUsage.SetType(NKikimrViewer::TStorageUsage::HDD);

diff --git a/ydb/core/viewer/protos/viewer.proto b/ydb/core/viewer/protos/viewer.proto
@@ -375,6 +375,8 @@ message TTenant {
     uint64 StorageAllocatedLimit = 41;
     Ydb.Cms.DatabaseQuotas DatabaseQuotas = 42;
     repeated TStorageUsage StorageUsage = 43;
+    repeated TStorageUsage TabletStorage = 44;
+    repeated TStorageUsage BlobStorage = 45;
 }
 
 message TTenants {