added version 1

ydb-platform · Aug 12, 2024 · 8b88561 · 8b88561
1 parent f0995a9
commit 8b88561
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/ydb/core/viewer/json_handlers_viewer.cpp b/ydb/core/viewer/json_handlers_viewer.cpp
@@ -218,7 +218,7 @@ void InitViewerHiveStatsJsonHandler(TJsonHandlers& handlers) {
 }
 
 void InitViewerTenantInfoJsonHandler(TJsonHandlers &handlers) {
-    handlers.AddHandler("/viewer/tenantinfo", new TJsonHandler<TJsonTenantInfo>(TJsonTenantInfo::GetSwagger()));
+    handlers.AddHandler("/viewer/tenantinfo", new TJsonHandler<TJsonTenantInfo>(TJsonTenantInfo::GetSwagger()), 2);
 }
 
 void InitViewerWhoAmIJsonHandler(TJsonHandlers& handlers) {

diff --git a/ydb/core/viewer/protos/viewer.proto b/ydb/core/viewer/protos/viewer.proto
@@ -392,6 +392,7 @@ message TTenants {
 message TTenantInfo {
     repeated TTenant TenantInfo = 1;
     repeated string Errors = 2;
+    uint32 Version = 3;
 }
 
 message TStoragePDisk {

diff --git a/ydb/core/viewer/viewer_tenantinfo.h b/ydb/core/viewer/viewer_tenantinfo.h
@@ -564,6 +564,7 @@ class TJsonTenantInfo : public TViewerPipeClient {
 
     void ReplyAndPassAway() override {
         BLOG_TRACE("ReplyAndPassAway() started");
+        Result.SetVersion(2);
         TIntrusivePtr<TDomainsInfo> domains = AppData()->DomainsInfo;
         auto *domain = domains->GetDomain();
         THashMap<TString, NKikimrViewer::EFlag> OverallByDomainId;
@@ -752,10 +753,10 @@ class TJsonTenantInfo : public TViewerPipeClient {
 
                     for (const auto& [type, size] : tablesStorageByType) {
                         auto it = storageQuotasByType.find(type);
-                        if (it != storageQuotasByType.end() && it->second.SoftQuota) {
-                            auto& tablesStorage = *tenant.AddTablesStorage();
-                            tablesStorage.SetType(type);
-                            tablesStorage.SetSize(size);
+                        auto& tablesStorage = *tenant.AddTablesStorage();
+                        tablesStorage.SetType(type);
+                        tablesStorage.SetSize(size);
+                        if (it != storageQuotasByType.end()) {
                             tablesStorage.SetLimit(it->second.SoftQuota);
                             tablesStorage.SetSoftQuota(it->second.SoftQuota);
                             tablesStorage.SetHardQuota(it->second.HardQuota);