diff options
| author | Alexey Efimov <xeno@ydb.tech> | 2024-11-26 09:36:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-11-26 11:36:36 +0300 |
| commit | 8999d1eaa997c20cff846c8fd72d6597fe0349b1 (patch) | |
| tree | 18e9fa19159f42c33ee4ae146dd6781113a0fd38 | |
| parent | 4fb4bbc9532f2ae56079ac0618cc72225225cf2c (diff) | |
| download | ydb-8999d1eaa997c20cff846c8fd72d6597fe0349b1.tar.gz | |
fix hanging tenantinfo on root domain (#11978)
| -rw-r--r-- | ydb/core/viewer/viewer_tenantinfo.h | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/ydb/core/viewer/viewer_tenantinfo.h b/ydb/core/viewer/viewer_tenantinfo.h index 9db9187912..2d22eb768b 100644 --- a/ydb/core/viewer/viewer_tenantinfo.h +++ b/ydb/core/viewer/viewer_tenantinfo.h @@ -127,18 +127,17 @@ public: if (Database.empty()) { ListTenantsResponse = MakeRequestConsoleListTenants(); } else { - TenantStatusResponses[Database] = MakeRequestConsoleGetTenantStatus(Database); NavigateKeySetResult[Database] = MakeRequestSchemeCacheNavigate(Database); - } - - 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); - NavigateKeySetResult[DomainPath] = MakeRequestSchemeCacheNavigate(DomainPath); - RequestMetadataCacheHealthCheck(DomainPath); + 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); + } } HiveDomainStats[RootHiveId] = MakeRequestHiveDomainStats(RootHiveId); |