Skip to content

Commit

Permalink
build: refresh Embedded UI (v6.36.1) (#11833)
Browse files Browse the repository at this point in the history
Co-authored-by: Raubzeug <[email protected]>
  • Loading branch information
2 people authored and StekPerepolnen committed Nov 25, 2024
1 parent ea7a15c commit 5ced356
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 2 deletions.
11 changes: 9 additions & 2 deletions ydb/core/viewer/json_pipe_req.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -748,6 +748,12 @@ void TViewerPipeClient::RequestDone(ui32 requests) {
}
}

void TViewerPipeClient::ResetAndBootstrap() {
Requests = 0;
DelayedRequests.clear();
Bootstrap();
}

void TViewerPipeClient::Handle(TEvTabletPipe::TEvClientConnected::TPtr& ev) {
if (ev->Get()->Status != NKikimrProto::OK) {
ui32 requests = FailPipeConnect(ev->Get()->TabletId);
Expand All @@ -763,7 +769,7 @@ void TViewerPipeClient::HandleResolveResource(TEvTxProxySchemeCache::TEvNavigate
SharedDatabase = CanonizePath(entry.Path);
if (SharedDatabase == AppData()->TenantName) {
Direct = true;
return Bootstrap(); // retry bootstrap without redirect this time
return ResetAndBootstrap(); // retry bootstrap without redirect this time
}
DatabaseBoardInfoResponse = MakeRequestStateStorageEndpointsLookup(SharedDatabase);
} else {
Expand Down Expand Up @@ -795,7 +801,8 @@ void TViewerPipeClient::HandleResolve(TEvStateStorage::TEvBoardInfo::TPtr& ev) {
if (DatabaseBoardInfoResponse->IsOk()) {
ReplyAndPassAway(MakeForward(GetNodesFromBoardReply(DatabaseBoardInfoResponse->GetRef())));
} else {
ReplyAndPassAway(GetHTTPBADREQUEST("text/plain", "Failed to resolve database - no nodes found"));
Direct = true;
ResetAndBootstrap(); // retry bootstrap without redirect this time
}
}
}
Expand Down
1 change: 1 addition & 0 deletions ydb/core/viewer/json_pipe_req.h
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,7 @@ class TViewerPipeClient : public TActorBootstrapped<TViewerPipeClient> {
TString MakeForward(const std::vector<ui32>& nodes);

void RequestDone(ui32 requests = 1);
void ResetAndBootstrap();
void AddEvent(const TString& name);
void Handle(TEvTabletPipe::TEvClientConnected::TPtr& ev);
void HandleResolveDatabase(TEvTxProxySchemeCache::TEvNavigateKeySetResult::TPtr& ev);
Expand Down

0 comments on commit 5ced356

Please sign in to comment.