Skip to content

Commit 8999d1e

Browse files
authored
fix hanging tenantinfo on root domain (#11978)
1 parent 4fb4bbc commit 8999d1e

File tree

1 file changed

+10
-11
lines changed

1 file changed

+10
-11
lines changed

ydb/core/viewer/viewer_tenantinfo.h

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -127,18 +127,17 @@ class TJsonTenantInfo : public TViewerPipeClient {
127127
if (Database.empty()) {
128128
ListTenantsResponse = MakeRequestConsoleListTenants();
129129
} else {
130-
TenantStatusResponses[Database] = MakeRequestConsoleGetTenantStatus(Database);
131130
NavigateKeySetResult[Database] = MakeRequestSchemeCacheNavigate(Database);
132-
}
133-
134-
if (Database.empty() || Database == DomainPath) {
135-
NKikimrViewer::TTenant& tenant = TenantBySubDomainKey[rootPathId];
136-
tenant.SetId(RootId);
137-
tenant.SetState(Ydb::Cms::GetDatabaseStatusResult::RUNNING);
138-
tenant.SetType(NKikimrViewer::Domain);
139-
tenant.SetName(DomainPath);
140-
NavigateKeySetResult[DomainPath] = MakeRequestSchemeCacheNavigate(DomainPath);
141-
RequestMetadataCacheHealthCheck(DomainPath);
131+
if (Database != DomainPath) {
132+
TenantStatusResponses[Database] = MakeRequestConsoleGetTenantStatus(Database);
133+
} else {
134+
NKikimrViewer::TTenant& tenant = TenantBySubDomainKey[rootPathId];
135+
tenant.SetId(RootId);
136+
tenant.SetState(Ydb::Cms::GetDatabaseStatusResult::RUNNING);
137+
tenant.SetType(NKikimrViewer::Domain);
138+
tenant.SetName(DomainPath);
139+
RequestMetadataCacheHealthCheck(DomainPath);
140+
}
142141
}
143142

144143
HiveDomainStats[RootHiveId] = MakeRequestHiveDomainStats(RootHiveId);

0 commit comments

Comments
 (0)