Merge 8f9859e into 4b60d4d

Author: StekPerepolnen

ydb/core/viewer/json_tenantinfo.h

@@ -56,6 +56,13 @@ class TJsonTenantInfo : public TViewerPipeClient<TJsonTenantInfo> {
     TString RootId; // id of root domain (tenant)
     NKikimrViewer::TTenantInfo Result;
 
+    struct TStorageUsage {
+        uint64 Size = 0;
+        uint64 Limit = 0;
+        uint64 SoftQuota = 0;
+        uint64 HardQuota = 0;
+    };
+
 public:
     static constexpr NKikimrServices::TActivity::EType ActorActivityType() {
         return NKikimrServices::TActivity::VIEWER_HANDLER;
@@ -478,6 +485,17 @@ class TJsonTenantInfo : public TViewerPipeClient<TJsonTenantInfo> {
         }
     }
 
+    NKikimrViewer::TStorageUsage::EType GetStorageType(const TString& poolKind) {
+        auto kind = to_lower(poolKind);
+        if (kind.StartsWith("ssd") || kind.StartsWith("nvme")) {
+            return NKikimrViewer::TStorageUsage::SSD;
+        }
+        if (kind.StartsWith("hdd") || kind.StartsWith("rot")) {
+            return NKikimrViewer::TStorageUsage::HDD;
+        }
+        return NKikimrViewer::TStorageUsage::None;
+    }
+
     void ReplyAndPassAway() {
         BLOG_TRACE("ReplyAndPassAway() started");
         TIntrusivePtr<TDomainsInfo> domains = AppData()->DomainsInfo;
@@ -632,23 +650,32 @@ 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);
-                        }
+                    THashMap<NKikimrViewer::TStorageUsage::EType, TStorageUsage> StorageUsageByType;
+                    for (const auto& poolUsage : entry.DomainDescription->Description.GetDiskSpaceUsage().GetStoragePoolsUsage()) {
+                        auto type = GetStorageType(poolUsage.GetPoolKind());
+                        auto& usage = StorageUsageByType[type];
+
+                        usage.Size += poolUsage.GetDataSize();
+                        usage.Limit += poolUsage.GetTotalSize();
+                    }
+
+                    for (auto& quota: tenant.databasequotas().storage_quotas()) {
+                        auto type = GetStorageType(quota.unit_kind());
+                        auto& usage = StorageUsageByType[type];
+
+                        usage.SoftQuota += quota.data_size_soft_quota();
+                        usage.HardQuota += quota.data_size_hard_quota();
+                    }
+
+                    for (const auto& [type, usage] : StorageUsageByType) {
+                        auto& storageUsage = *tenant.AddStorageUsage();
+                        storageUsage.SetType(type);
+                        storageUsage.SetSize(usage.Size);
+                        storageUsage.SetLimit(usage.Limit);
+                        storageUsage.SetSoftQuota(usage.SoftQuota);
+                        storageUsage.SetHardQuota(usage.HardQuota);
                     }
                 }