fix tenantinfo storage info (#6960)

Author: adameat

ydb/core/viewer/json_tenantinfo.h

@@ -535,6 +535,18 @@ class TJsonTenantInfo : public TViewerPipeClient {
         return NKikimrViewer::TStorageUsage::None;
     }
 
+    NKikimrViewer::TStorageUsage::EType GuessStorageType(const NKikimrSubDomains::TDomainDescription& domainDescription) {
+        NKikimrViewer::TStorageUsage::EType type = NKikimrViewer::TStorageUsage::SSD;
+        for (const auto& pool : domainDescription.GetStoragePools()) {
+            auto poolType = GetStorageType(pool.GetKind());
+            if (poolType != NKikimrViewer::TStorageUsage::None) {
+                type = poolType;
+                break;
+            }
+        }
+        return type;
+    }
+
     void ReplyAndPassAway() override {
         BLOG_TRACE("ReplyAndPassAway() started");
         TIntrusivePtr<TDomainsInfo> domains = AppData()->DomainsInfo;
@@ -693,12 +705,6 @@ class TJsonTenantInfo : public TViewerPipeClient {
 
                     THashMap<NKikimrViewer::TStorageUsage::EType, ui64> storageUsageByType;
                     THashMap<NKikimrViewer::TStorageUsage::EType, TStorageQuota> storageQuotasByType;
-                    if (entry.DomainDescription) {
-                        for (const auto& poolUsage : entry.DomainDescription->Description.GetDiskSpaceUsage().GetStoragePoolsUsage()) {
-                            auto type = GetStorageType(poolUsage.GetPoolKind());
-                            storageUsageByType[type] += poolUsage.GetTotalSize();
-                        }
-                    }
 
                     for (const auto& quota : tenant.GetDatabaseQuotas().storage_quotas()) {
                         auto type = GetStorageType(quota.unit_kind());
@@ -707,6 +713,24 @@ class TJsonTenantInfo : public TViewerPipeClient {
                         usage.HardQuota += quota.data_size_hard_quota();
                     }
 
+                    if (entry.DomainDescription) {
+                        for (const auto& poolUsage : entry.DomainDescription->Description.GetDiskSpaceUsage().GetStoragePoolsUsage()) {
+                            auto type = GetStorageType(poolUsage.GetPoolKind());
+                            storageUsageByType[type] += poolUsage.GetTotalSize();
+                        }
+
+                        if (storageUsageByType.empty() && entry.DomainDescription->Description.HasDiskSpaceUsage()) {
+                            storageUsageByType[GuessStorageType(entry.DomainDescription->Description)] =
+                                entry.DomainDescription->Description.GetDiskSpaceUsage().GetTables().GetTotalSize();
+                        }
+
+                        if (storageQuotasByType.empty()) {
+                            auto& quotas = storageQuotasByType[GuessStorageType(entry.DomainDescription->Description)];
+                            quotas.HardQuota = entry.DomainDescription->Description.GetDatabaseQuotas().data_size_hard_quota();
+                            quotas.SoftQuota = entry.DomainDescription->Description.GetDatabaseQuotas().data_size_soft_quota();
+                        }
+                    }
+
                     for (const auto& [type, size] : storageUsageByType) {
                         auto& storageUsage = *tenant.AddStorageUsage();
                         storageUsage.SetType(type);