Skip to content

fix redirects and tabletinfo filtering for serverless databases #14221

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
merged 4 commits into from
Feb 6, 2025
Merged

fix redirects and tabletinfo filtering for serverless databases #14221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3bcab71
return PQRB tablet in ui (#14056)
adameat Feb 4, 2025
c07d0ff
fix redirects for serverless databases (#13856)
adameat Jan 28, 2025
ad77dc0
improve redirects and tabletinfo filtering for serverless databases (…
adameat Jan 30, 2025
82e0a60
fixes after review
adameat Feb 6, 2025
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
1 change: 1 addition & 0 deletions ydb/core/protos/node_whiteboard.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ message TEvTabletStateRequest {
optional string Format = 5; // it could be "packed5"
optional string GroupBy = 20; // it's either empty or "Type,State" for now
repeated fixed64 FilterTabletId = 22;
optional NKikimrSubDomains.TDomainKey FilterTenantId = 23;
}

message TEvTabletStateResponse {
Expand Down
33 changes: 24 additions & 9 deletions ydb/core/tablet/node_whiteboard.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -808,24 +808,36 @@ class TNodeWhiteboardService : public TActorBootstrapped<TNodeWhiteboardService>
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,
filterTenantId = request.has_filtertenantid() ? NKikimr::TSubDomainKey(request.filtertenantid()) : NKikimr::TSubDomainKey()
](const NKikimrWhiteboard::TTabletStateInfo& tabletStateInfo) {
return tabletStateInfo.changetime() >= changedSince
&& (!filterTenantId || filterTenantId == NKikimr::TSubDomainKey(tabletStateInfo.tenantid()));
};
std::unique_ptr<TEvWhiteboard::TEvTabletStateResponse> response = std::make_unique<TEvWhiteboard::TEvTabletStateResponse>();
auto& record = response->Record;
if (request.format() == "packed5") {
TEvWhiteboard::TEvTabletStateResponsePacked5* ptr = response->AllocatePackedResponse(TabletStateInfo.size());
std::vector<const NKikimrWhiteboard::TTabletStateInfo*> matchedTablets;
for (const auto& [tabletId, tabletInfo] : TabletStateInfo) {
ptr->TabletId = tabletInfo.tabletid();
ptr->FollowerId = tabletInfo.followerid();
ptr->Generation = tabletInfo.generation();
ptr->Type = tabletInfo.type();
ptr->State = tabletInfo.state();
if (matchesFilter(tabletInfo)) {
matchedTablets.push_back(&tabletInfo);
}
}
TEvWhiteboard::TEvTabletStateResponsePacked5* ptr = response->AllocatePackedResponse(matchedTablets.size());
for (auto tabletInfo : matchedTablets) {
ptr->TabletId = tabletInfo->tabletid();
ptr->FollowerId = tabletInfo->followerid();
ptr->Generation = tabletInfo->generation();
ptr->Type = tabletInfo->type();
ptr->State = tabletInfo->state();
++ptr;
}
} else {
if (request.groupby().empty()) {
ui64 changedSince = request.has_changedsince() ? request.changedsince() : 0;
if (request.filtertabletid_size() == 0) {
for (const auto& pr : TabletStateInfo) {
if (pr.second.changetime() >= changedSince) {
if (matchesFilter(pr.second)) {
NKikimrWhiteboard::TTabletStateInfo& tabletStateInfo = *record.add_tabletstateinfo();
Copy(tabletStateInfo, pr.second, request);
}
Expand All @@ -834,7 +846,7 @@ class TNodeWhiteboardService : public TActorBootstrapped<TNodeWhiteboardService>
for (auto tabletId : request.filtertabletid()) {
auto it = TabletStateInfo.find({tabletId, 0});
if (it != TabletStateInfo.end()) {
if (it->second.changetime() >= changedSince) {
if (matchesFilter(it->second)) {
NKikimrWhiteboard::TTabletStateInfo& tabletStateInfo = *record.add_tabletstateinfo();
Copy(tabletStateInfo, it->second, request);
}
Expand All @@ -845,6 +857,9 @@ class TNodeWhiteboardService : public TActorBootstrapped<TNodeWhiteboardService>
std::unordered_map<std::pair<NKikimrTabletBase::TTabletTypes::EType,
NKikimrWhiteboard::TTabletStateInfo::ETabletState>, NKikimrWhiteboard::TTabletStateInfo> stateGroupBy;
for (const auto& [id, stateInfo] : TabletStateInfo) {
if (!matchesFilter(stateInfo)) {
continue;
}
NKikimrWhiteboard::TTabletStateInfo& state = stateGroupBy[{stateInfo.type(), stateInfo.state()}];
auto count = state.count();
if (count == 0) {
Expand Down
46 changes: 30 additions & 16 deletions ydb/core/viewer/json_pipe_req.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -754,11 +754,15 @@ void TViewerPipeClient::RequestDone(ui32 requests) {
if (!DelayedRequests.empty()) {
SendDelayedRequests();
}
if (Requests == 0) {
if (Requests == 0 && !PassedAway) {
ReplyAndPassAway();
}
}

void TViewerPipeClient::CancelAllRequests() {
DelayedRequests.clear();
}

void TViewerPipeClient::Handle(TEvTabletPipe::TEvClientConnected::TPtr& ev) {
if (ev->Get()->Status != NKikimrProto::OK) {
ui32 requests = FailPipeConnect(ev->Get()->TabletId);
Expand All @@ -772,17 +776,15 @@ void TViewerPipeClient::HandleResolveResource(TEvTxProxySchemeCache::TEvNavigate
if (ResourceNavigateResponse->IsOk()) {
TSchemeCacheNavigate::TEntry& entry(ResourceNavigateResponse->Get()->Request->ResultSet.front());
SharedDatabase = CanonizePath(entry.Path);
if (SharedDatabase == AppData()->TenantName) {
Direct = true;
Bootstrap(); // retry bootstrap without redirect this time
} else {
DatabaseBoardInfoResponse = MakeRequestStateStorageEndpointsLookup(SharedDatabase);
}
Direct |= (SharedDatabase == AppData()->TenantName);
DatabaseBoardInfoResponse = MakeRequestStateStorageEndpointsLookup(SharedDatabase);
--Requests; // don't count this request
} else {
return ReplyAndPassAway(GetHTTPBADREQUEST("text/plain", "Failed to resolve database - shared database not found"));
AddEvent("Failed to resolve database - shared database not found");
Direct = true;
Bootstrap(); // retry bootstrap without redirect this time
}
}
RequestDone();
}

void TViewerPipeClient::HandleResolveDatabase(TEvTxProxySchemeCache::TEvNavigateKeySetResult::TPtr& ev) {
Expand All @@ -792,28 +794,36 @@ void TViewerPipeClient::HandleResolveDatabase(TEvTxProxySchemeCache::TEvNavigate
TSchemeCacheNavigate::TEntry& entry(DatabaseNavigateResponse->Get()->Request->ResultSet.front());
if (entry.DomainInfo && entry.DomainInfo->ResourcesDomainKey && entry.DomainInfo->DomainKey != entry.DomainInfo->ResourcesDomainKey) {
ResourceNavigateResponse = MakeRequestSchemeCacheNavigate(TPathId(entry.DomainInfo->ResourcesDomainKey));
--Requests; // don't count this request
Become(&TViewerPipeClient::StateResolveResource);
} else {
DatabaseBoardInfoResponse = MakeRequestStateStorageEndpointsLookup(CanonizePath(entry.Path));
Database = CanonizePath(entry.Path);
DatabaseBoardInfoResponse = MakeRequestStateStorageEndpointsLookup(Database);
--Requests; // don't count this request
}
} else {
return ReplyAndPassAway(GetHTTPBADREQUEST("text/plain", "Failed to resolve database - not found"));
AddEvent("Failed to resolve database - not found");
Direct = true;
Bootstrap(); // retry bootstrap without redirect this time
}
}
RequestDone();
}

void TViewerPipeClient::HandleResolve(TEvStateStorage::TEvBoardInfo::TPtr& ev) {
if (DatabaseBoardInfoResponse) {
DatabaseBoardInfoResponse->Set(std::move(ev));
if (DatabaseBoardInfoResponse->IsOk()) {
return ReplyAndPassAway(MakeForward(GetNodesFromBoardReply(DatabaseBoardInfoResponse->GetRef())));
if (Direct) {
Bootstrap(); // retry bootstrap without redirect this time
} else {
ReplyAndPassAway(MakeForward(GetNodesFromBoardReply(DatabaseBoardInfoResponse->GetRef())));
}
} else {
AddEvent("Failed to resolve database nodes");
Direct = true;
Bootstrap(); // retry bootstrap without redirect this time
}
}
RequestDone();
}

void TViewerPipeClient::HandleTimeout() {
Expand All @@ -838,14 +848,16 @@ STATEFN(TViewerPipeClient::StateResolveResource) {

void TViewerPipeClient::RedirectToDatabase(const TString& database) {
DatabaseNavigateResponse = MakeRequestSchemeCacheNavigate(database);
--Requests; // don't count this request
Become(&TViewerPipeClient::StateResolveDatabase);
}

bool TViewerPipeClient::NeedToRedirect() {
if (Event) {
if (NeedRedirect && Event) {
NeedRedirect = false;
Direct |= !Event->Get()->Request.GetHeader("X-Forwarded-From-Node").empty(); // we're already forwarding
Direct |= (Database == AppData()->TenantName) || Database.empty(); // we're already on the right node or don't use database filter
if (Database && !Direct) {
if (Database) {
RedirectToDatabase(Database); // to find some dynamic node and redirect query there
return true;
}
Expand All @@ -860,6 +872,8 @@ void TViewerPipeClient::PassAway() {
Send(TActivationContext::InterconnectProxy(nodeId), new TEvents::TEvUnsubscribe());
}
ClosePipes();
CancelAllRequests();
PassedAway = true;
TBase::PassAway();
}

Expand Down
3 changes: 3 additions & 0 deletions ydb/core/viewer/json_pipe_req.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,9 @@ class TViewerPipeClient : public TActorBootstrapped<TViewerPipeClient> {
TString Database;
TString SharedDatabase;
bool Direct = false;
bool NeedRedirect = true;
ui32 Requests = 0;
bool PassedAway = false;
ui32 MaxRequestsInFlight = 200;
NWilson::TSpan Span;
IViewer* Viewer = nullptr;
Expand Down Expand Up @@ -303,6 +305,7 @@ class TViewerPipeClient : public TActorBootstrapped<TViewerPipeClient> {
TString MakeForward(const std::vector<ui32>& nodes);

void RequestDone(ui32 requests = 1);
void CancelAllRequests();
void AddEvent(const TString& name);
void Handle(TEvTabletPipe::TEvClientConnected::TPtr& ev);
void HandleResolveDatabase(TEvTxProxySchemeCache::TEvNavigateKeySetResult::TPtr& ev);
Expand Down
39 changes: 34 additions & 5 deletions ydb/core/viewer/viewer_tabletinfo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,8 @@ class TJsonTabletInfo : public TJsonWhiteboardRequest<TEvWhiteboard::TEvTabletSt
std::unordered_map<ui64, TString> EndOfRangeKeyPrefix;
TTabletId HiveId;
bool IsBase64Encode = true;
NKikimr::TSubDomainKey FilterTenantId;

public:
TJsonTabletInfo(IViewer *viewer, NMon::TEvHttpInfo::TPtr &ev)
: TJsonWhiteboardRequest(viewer, ev)
Expand All @@ -88,11 +90,25 @@ class TJsonTabletInfo : public TJsonWhiteboardRequest<TEvWhiteboard::TEvTabletSt
}
const auto& params(Event->Get()->Request.GetParams());
TBase::RequestSettings.Timeout = FromStringWithDefault<ui32>(params.Get("timeout"), 10000);

if (DatabaseNavigateResponse && DatabaseNavigateResponse->IsOk()) {
TPathId domainRoot;
if (AppData()) {
TIntrusivePtr<TDomainsInfo> domains = AppData()->DomainsInfo;
auto* domain = domains->GetDomain();
if (domain) {
domainRoot = TPathId(domain->SchemeRoot, 1);
}
}
if (DatabaseNavigateResponse->Get()->Request->ResultSet.front().DomainInfo->DomainKey != domainRoot) {
const TPathId& pathId(DatabaseNavigateResponse->Get()->Request->ResultSet.front().DomainInfo->DomainKey);
FilterTenantId.first = pathId.OwnerId;
FilterTenantId.second = pathId.LocalPathId;
}
}
if (DatabaseBoardInfoResponse && DatabaseBoardInfoResponse->IsOk()) {
TBase::RequestSettings.FilterNodeIds = TBase::GetNodesFromBoardReply(DatabaseBoardInfoResponse->GetRef());
} else if (Database) {
RequestStateStorageEndpointsLookup(Database);
} else if (Database || SharedDatabase) {
RequestStateStorageEndpointsLookup(SharedDatabase ? SharedDatabase : Database);
Become(&TThis::StateRequestedLookup, TDuration::MilliSeconds(TBase::RequestSettings.Timeout), new TEvents::TEvWakeup());
return;
}
Expand Down Expand Up @@ -125,6 +141,10 @@ class TJsonTabletInfo : public TJsonWhiteboardRequest<TEvWhiteboard::TEvTabletSt
}
}
}
if (FilterTenantId) {
request->Record.MutableFilterTenantId()->SetSchemeShard(FilterTenantId.GetSchemeShard());
request->Record.MutableFilterTenantId()->SetPathId(FilterTenantId.GetPathId());
}
return request;
}

Expand Down Expand Up @@ -241,6 +261,9 @@ class TJsonTabletInfo : public TJsonWhiteboardRequest<TEvWhiteboard::TEvTabletSt
for (const auto& partition : pathDescription.GetPersQueueGroup().GetPartitions()) {
Tablets[partition.GetTabletId()] = NKikimrTabletBase::TTabletTypes::PersQueue;
}
if (pathDescription.HasPersQueueGroup()) {
Tablets[pathDescription.GetPersQueueGroup().GetBalancerTabletID()] = NKikimrTabletBase::TTabletTypes::PersQueueReadBalancer;
}
if (pathDescription.HasRtmrVolumeDescription()) {
for (const auto& partition : pathDescription.GetRtmrVolumeDescription().GetPartitions()) {
Tablets[partition.GetTabletId()] = NKikimrTabletBase::TTabletTypes::RTMRPartition;
Expand Down Expand Up @@ -365,8 +388,14 @@ class TJsonTabletInfo : public TJsonWhiteboardRequest<TEvWhiteboard::TEvTabletSt
result.SetResponseTime(response.GetResponseTime());
response = std::move(result);
}
for (NKikimrWhiteboard::TTabletStateInfo& info : *response.MutableTabletStateInfo()) {
info.SetOverall(GetWhiteboardFlag(GetFlagFromTabletState(info.GetState())));
auto& cont(*response.MutableTabletStateInfo());
for (auto it = cont.begin(); it != cont.end();) {
if (FilterTenantId && NKikimr::TSubDomainKey(it->GetTenantId()) != FilterTenantId) {
it = cont.erase(it);
} else {
it->SetOverall(GetWhiteboardFlag(GetFlagFromTabletState(it->GetState())));
++it;
}
}
TBase::FilterResponse(response);
}
Expand Down
4 changes: 2 additions & 2 deletions ydb/core/viewer/viewer_tenantinfo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,11 +123,12 @@ class TJsonTenantInfo : public TViewerPipeClient {

if (Database.empty()) {
ListTenantsResponse = MakeRequestConsoleListTenants();
NavigateKeySetResult[DomainPath] = MakeRequestSchemeCacheNavigate(DomainPath);
} else {
NavigateKeySetResult[Database] = MakeRequestSchemeCacheNavigate(Database);
if (Database != DomainPath) {
TenantStatusResponses[Database] = MakeRequestConsoleGetTenantStatus(Database);
}
NavigateKeySetResult[Database] = MakeRequestSchemeCacheNavigate(Database);
}

if (Database.empty() || Database == DomainPath) {
Expand All @@ -137,7 +138,6 @@ class TJsonTenantInfo : public TViewerPipeClient {
tenant.SetType(NKikimrViewer::Domain);
tenant.SetName(DomainPath);
RequestMetadataCacheHealthCheck(DomainPath);
NavigateKeySetResult[DomainPath] = MakeRequestSchemeCacheNavigate(DomainPath);
}

HiveDomainStats[RootHiveId] = MakeRequestHiveDomainStats(RootHiveId);
Expand Down
Loading