aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandrew-rykov <arykov@ydb.tech>2023-06-06 14:33:48 +0300
committerandrew-rykov <arykov@ydb.tech>2023-06-06 14:33:48 +0300
commit7f8e5bba976bab99984226a4d4a448f178095be0 (patch)
tree1ed684b0f890d09f2c53cad0012d48aa3ca182f3
parentcb163fee0ba3ee7d1b165c48df3b34732f807c27 (diff)
downloadydb-7f8e5bba976bab99984226a4d4a448f178095be0.tar.gz
shared db related label
-rw-r--r--ydb/core/viewer/json_tenantinfo.h12
1 files changed, 11 insertions, 1 deletions
diff --git a/ydb/core/viewer/json_tenantinfo.h b/ydb/core/viewer/json_tenantinfo.h
index a7b0d8a6f95..63c469f346a 100644
--- a/ydb/core/viewer/json_tenantinfo.h
+++ b/ydb/core/viewer/json_tenantinfo.h
@@ -165,6 +165,10 @@ public:
NKikimrViewer::TTenant& tenant = TenantByPath[path];
tenant.SetName(path);
tenant.SetState(getTenantStatusResult.state());
+ if (getTenantStatusResult.has_required_shared_resources()) {
+ tenant.SetType(NKikimrViewer::Shared);
+ RequestSchemeCacheNavigate(path);
+ }
for (const Ydb::Cms::StorageUnits& unit : getTenantStatusResult.allocated_resources().storage_units()) {
NKikimrViewer::TTenantResource& resource = *tenant.MutableResources()->AddAllocated();
resource.SetType("storage");
@@ -420,7 +424,13 @@ public:
tenant = std::move(itTenantByPath->second);
TenantByPath.erase(itTenantByPath);
}
- tenant.MergeFrom(tenantBySubDomainKey);
+ if (tenant.GetType() == NKikimrViewer::UnknownTenantType) {
+ tenant.MergeFrom(tenantBySubDomainKey);
+ } else {
+ auto oldType = tenant.GetType();
+ tenant.MergeFrom(tenantBySubDomainKey);
+ tenant.SetType(oldType);
+ }
if (!tenant.GetId()) {
tenant.SetId(GetDomainId(subDomainKey));
}