Skip to content

Commit 5a90372

Browse files
authored
do not filter out dead tablets, set proper hive for dead tablets (#15231)
1 parent 1f60fc8 commit 5a90372

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

ydb/core/viewer/viewer_tabletinfo.h

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ class TJsonTabletInfo : public TJsonWhiteboardRequest<TEvWhiteboard::TEvTabletSt
7272
using TThis = TJsonTabletInfo;
7373
THashMap<ui64, NKikimrTabletBase::TTabletTypes::EType> Tablets;
7474
std::unordered_map<ui64, TString> EndOfRangeKeyPrefix;
75-
TTabletId HiveId;
75+
TTabletId HiveId = 0;
7676
bool IsBase64Encode = true;
7777
NKikimr::TSubDomainKey FilterTenantId;
7878

@@ -315,6 +315,8 @@ class TJsonTabletInfo : public TJsonWhiteboardRequest<TEvWhiteboard::TEvTabletSt
315315
if (domainDescription.GetProcessingParams().HasHive()) {
316316
Tablets[pathDescription.GetDomainDescription().GetProcessingParams().GetHive()] = NKikimrTabletBase::TTabletTypes::Hive;
317317
HiveId = domainDescription.GetProcessingParams().GetHive();
318+
} else {
319+
HiveId = domainDescription.GetSharedHive();
318320
}
319321
if (domainDescription.GetProcessingParams().HasGraphShard()) {
320322
Tablets[pathDescription.GetDomainDescription().GetProcessingParams().GetGraphShard()] = NKikimrTabletBase::TTabletTypes::GraphShard;
@@ -383,6 +385,9 @@ class TJsonTabletInfo : public TJsonWhiteboardRequest<TEvWhiteboard::TEvTabletSt
383385
deadTablet->SetState(NKikimrWhiteboard::TTabletStateInfo::Dead);
384386
deadTablet->SetType(tablet.second);
385387
deadTablet->SetHiveId(HiveId);
388+
if (FilterTenantId) {
389+
deadTablet->MutableTenantId()->CopyFrom(FilterTenantId);
390+
}
386391
}
387392
}
388393
result.SetResponseTime(response.GetResponseTime());

0 commit comments

Comments
 (0)