fixing domain appearing in tenantinfo handler (#13024)

ydb-platform · Dec 26, 2024 · 24d1f57 · 24d1f57
1 parent 5d2ab94
commit 24d1f57
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/ydb/core/viewer/viewer_tenantinfo.h b/ydb/core/viewer/viewer_tenantinfo.h
@@ -130,16 +130,19 @@ class TJsonTenantInfo : public TViewerPipeClient {
             NavigateKeySetResult[Database] = MakeRequestSchemeCacheNavigate(Database);
             if (Database != DomainPath) {
                 TenantStatusResponses[Database] = MakeRequestConsoleGetTenantStatus(Database);
-            } else {
-                NKikimrViewer::TTenant& tenant = TenantBySubDomainKey[rootPathId];
-                tenant.SetId(RootId);
-                tenant.SetState(Ydb::Cms::GetDatabaseStatusResult::RUNNING);
-                tenant.SetType(NKikimrViewer::Domain);
-                tenant.SetName(DomainPath);
-                RequestMetadataCacheHealthCheck(DomainPath);
             }
         }
 
+        if (Database.empty() || Database == DomainPath) {
+            NKikimrViewer::TTenant& tenant = TenantBySubDomainKey[rootPathId];
+            tenant.SetId(RootId);
+            tenant.SetState(Ydb::Cms::GetDatabaseStatusResult::RUNNING);
+            tenant.SetType(NKikimrViewer::Domain);
+            tenant.SetName(DomainPath);
+            RequestMetadataCacheHealthCheck(DomainPath);
+            NavigateKeySetResult[DomainPath] = MakeRequestSchemeCacheNavigate(DomainPath);
+        }
+
         HiveDomainStats[RootHiveId] = MakeRequestHiveDomainStats(RootHiveId);
         if (Storage) {
             HiveStorageStats[RootHiveId] = MakeRequestHiveStorageStats(RootHiveId);