Skip to content

fix follower filter in tablet info handler #15988

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adameat merged 1 commit into from
Mar 20, 2025
Merged

fix follower filter in tablet info handler #15988

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 15 additions & 16 deletions ydb/core/tablet/node_whiteboard.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -841,14 +841,25 @@ class TNodeWhiteboardService : public TActorBootstrapped<TNodeWhiteboardService>
}
}

static std::unordered_set<TTabletId> BuildIndex(const ::google::protobuf::RepeatedField<::NProtoBuf::uint64>& array) {
std::unordered_set<TTabletId> result;
result.reserve(array.size());
for (auto id : array) {
result.insert(id);
}
return result;
}

void Handle(TEvWhiteboard::TEvTabletStateRequest::TPtr &ev, const TActorContext &ctx) {
auto now = TMonotonic::Now();
const auto& request = ev->Get()->Record;
auto matchesFilter = [
changedSince = request.has_changedsince() ? request.changedsince() : 0,
filterTabletId = BuildIndex(request.filtertabletid()),
filterTenantId = request.has_filtertenantid() ? NKikimr::TSubDomainKey(request.filtertenantid()) : NKikimr::TSubDomainKey()
](const NKikimrWhiteboard::TTabletStateInfo& tabletStateInfo) {
return tabletStateInfo.changetime() >= changedSince
&& (filterTabletId.empty() || filterTabletId.count(tabletStateInfo.tabletid()))
&& (!filterTenantId || filterTenantId == NKikimr::TSubDomainKey(tabletStateInfo.tenantid()));
};
std::unique_ptr<TEvWhiteboard::TEvTabletStateResponse> response = std::make_unique<TEvWhiteboard::TEvTabletStateResponse>();
Expand All @@ -871,22 +882,10 @@ class TNodeWhiteboardService : public TActorBootstrapped<TNodeWhiteboardService>
}
} else {
if (request.groupby().empty()) {
if (request.filtertabletid_size() == 0) {
for (const auto& pr : TabletStateInfo) {
if (matchesFilter(pr.second)) {
NKikimrWhiteboard::TTabletStateInfo& tabletStateInfo = *record.add_tabletstateinfo();
Copy(tabletStateInfo, pr.second, request);
}
}
} else {
for (auto tabletId : request.filtertabletid()) {
auto it = TabletStateInfo.find({tabletId, 0});
if (it != TabletStateInfo.end()) {
if (matchesFilter(it->second)) {
NKikimrWhiteboard::TTabletStateInfo& tabletStateInfo = *record.add_tabletstateinfo();
Copy(tabletStateInfo, it->second, request);
}
}
for (const auto& pr : TabletStateInfo) {
if (matchesFilter(pr.second)) {
NKikimrWhiteboard::TTabletStateInfo& tabletStateInfo = *record.add_tabletstateinfo();
Copy(tabletStateInfo, pr.second, request);
}
}
} else if (request.groupby() == "Type,State" || request.groupby() == "NodeId,Type,State") { // the only supported group-by for now
Expand Down
15 changes: 11 additions & 4 deletions ydb/core/viewer/viewer_tabletinfo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ class TJsonTabletInfo : public TJsonWhiteboardRequest<TEvWhiteboard::TEvTabletSt
using TBase = TJsonWhiteboardRequest<TEvWhiteboard::TEvTabletStateRequest, TEvWhiteboard::TEvTabletStateResponse>;
using TThis = TJsonTabletInfo;
THashMap<ui64, NKikimrTabletBase::TTabletTypes::EType> Tablets;
std::unordered_set<ui64> DeadTablets;
std::unordered_map<ui64, TString> EndOfRangeKeyPrefix;
TTabletId HiveId = 0;
bool IsBase64Encode = true;
Expand Down Expand Up @@ -365,6 +366,12 @@ class TJsonTabletInfo : public TJsonWhiteboardRequest<TEvWhiteboard::TEvTabletSt

virtual void FilterResponse(NKikimrWhiteboard::TEvTabletStateResponse& response) override {
if (!Tablets.empty()) {
if (ReplyWithDeadTabletsInfo) {
DeadTablets.reserve(Tablets.size());
for (const auto& [tabletId, tabletType] : Tablets) {
DeadTablets.insert(tabletId);
}
}
NKikimrWhiteboard::TEvTabletStateResponse result;
for (const NKikimrWhiteboard::TTabletStateInfo& info : response.GetTabletStateInfo()) {
auto tablet = Tablets.find(info.GetTabletId());
Expand All @@ -375,15 +382,15 @@ class TJsonTabletInfo : public TJsonWhiteboardRequest<TEvWhiteboard::TEvTabletSt
if (itKey != EndOfRangeKeyPrefix.end()) {
tabletInfo->SetEndOfRangeKeyPrefix(itKey->second);
}
Tablets.erase(tablet->first);
DeadTablets.erase(tablet->first);
}
}
if (ReplyWithDeadTabletsInfo) {
for (auto tablet : Tablets) {
for (auto tabletId : DeadTablets) {
auto deadTablet = result.MutableTabletStateInfo()->Add();
deadTablet->SetTabletId(tablet.first);
deadTablet->SetTabletId(tabletId);
deadTablet->SetState(NKikimrWhiteboard::TTabletStateInfo::Dead);
deadTablet->SetType(tablet.second);
deadTablet->SetType(Tablets[tabletId]);
deadTablet->SetHiveId(HiveId);
if (FilterTenantId) {
deadTablet->MutableTenantId()->CopyFrom(FilterTenantId);
Expand Down
Loading