Skip to content

Commit f7accc2

Browse files
committed
Dont return shared nodes for serverless KIKIMR-21128 (#2264)
1 parent 6a51e53 commit f7accc2

File tree

2 files changed

+158
-85
lines changed

2 files changed

+158
-85
lines changed

ydb/core/viewer/json_nodes.h

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -411,27 +411,25 @@ class TJsonNodes : public TViewerPipeClient<TJsonNodes> {
411411
const auto localPathId = entry.DomainInfo->DomainKey.LocalPathId;
412412
FilterSubDomainKey = TSubDomainKey(ownerId, localPathId);
413413
}
414+
415+
if (FilterTenant.empty()) {
416+
RequestForTenant(path);
417+
}
418+
414419
if (entry.DomainInfo->ResourcesDomainKey && entry.DomainInfo->DomainKey != entry.DomainInfo->ResourcesDomainKey) {
415420
TPathId resourceDomainKey(entry.DomainInfo->ResourcesDomainKey);
416421
BLOG_TRACE("Requesting navigate for resource domain " << resourceDomainKey);
417422
RequestSchemeCacheNavigate(resourceDomainKey);
418423
++RequestsBeforeNodeList;
419-
} else {
420-
if (FilterTenant.empty()) {
421-
RequestForTenant(path);
422-
}
423-
if (Storage) {
424-
if (entry.DomainDescription) {
425-
for (const auto& storagePool : entry.DomainDescription->Description.GetStoragePools()) {
426-
TString storagePoolName = storagePool.GetName();
427-
THolder<TEvBlobStorage::TEvControllerSelectGroups> request = MakeHolder<TEvBlobStorage::TEvControllerSelectGroups>();
428-
request->Record.SetReturnAllMatchingGroups(true);
429-
request->Record.AddGroupParameters()->MutableStoragePoolSpecifier()->SetName(storagePoolName);
430-
BLOG_TRACE("Requesting BSControllerSelectGroups for " << storagePoolName);
431-
RequestBSControllerSelectGroups(std::move(request));
432-
++RequestsBeforeNodeList;
433-
}
434-
}
424+
} else if (Storage && entry.DomainDescription) {
425+
for (const auto& storagePool : entry.DomainDescription->Description.GetStoragePools()) {
426+
TString storagePoolName = storagePool.GetName();
427+
THolder<TEvBlobStorage::TEvControllerSelectGroups> request = MakeHolder<TEvBlobStorage::TEvControllerSelectGroups>();
428+
request->Record.SetReturnAllMatchingGroups(true);
429+
request->Record.AddGroupParameters()->MutableStoragePoolSpecifier()->SetName(storagePoolName);
430+
BLOG_TRACE("Requesting BSControllerSelectGroups for " << storagePoolName);
431+
RequestBSControllerSelectGroups(std::move(request));
432+
++RequestsBeforeNodeList;
435433
}
436434
}
437435
} else {

0 commit comments

Comments
 (0)