Fix UI error "Failed to resolve database" - merge stream-nb-24-3 (#12359)

StekPerepolnen · alexv-smirnov · Raubzeug · web-flow · commit f1c85b9f8d8f · 2024-12-09T10:57:42.000+01:00
Co-authored-by: AlexSm &lt;alex@ydb.tech&gt;
Co-authored-by: Raubzeug &lt;Raubzeug@users.noreply.github.com&gt;
diff --git a/ydb/core/viewer/json_pipe_req.cpp b/ydb/core/viewer/json_pipe_req.cpp
@@ -564,6 +564,9 @@ TViewerPipeClient::TRequestResponse<TEvTxProxySchemeCache::TEvNavigateKeySetResu
 void TViewerPipeClient::RequestTxProxyDescribe(const TString& path) {
     THolder<TEvTxUserProxy::TEvNavigate> request(new TEvTxUserProxy::TEvNavigate());
     request->Record.MutableDescribePath()->SetPath(path);
+    if (!Event->Get()->UserToken.empty()) {
+        request->Record.SetUserToken(Event->Get()->UserToken);
+    }
     SendRequest(MakeTxProxyID(), request.Release());
 }
 
@@ -754,13 +757,15 @@ void TViewerPipeClient::HandleResolveResource(TEvTxProxySchemeCache::TEvNavigate
             SharedDatabase = CanonizePath(entry.Path);
             if (SharedDatabase == AppData()->TenantName) {
                 Direct = true;
-                return Bootstrap(); // retry bootstrap without redirect this time
+                Bootstrap(); // retry bootstrap without redirect this time
+            } else {
+                DatabaseBoardInfoResponse = MakeRequestStateStorageEndpointsLookup(SharedDatabase);
             }
-            DatabaseBoardInfoResponse = MakeRequestStateStorageEndpointsLookup(SharedDatabase);
         } else {
-            ReplyAndPassAway(GetHTTPBADREQUEST("text/plain", "Failed to resolve database - shared database not found"));
+            return ReplyAndPassAway(GetHTTPBADREQUEST("text/plain", "Failed to resolve database - shared database not found"));
         }
     }
+    RequestDone();
 }
 
 void TViewerPipeClient::HandleResolveDatabase(TEvTxProxySchemeCache::TEvNavigateKeySetResult::TPtr& ev) {
@@ -771,24 +776,27 @@ void TViewerPipeClient::HandleResolveDatabase(TEvTxProxySchemeCache::TEvNavigate
             if (entry.DomainInfo && entry.DomainInfo->ResourcesDomainKey && entry.DomainInfo->DomainKey != entry.DomainInfo->ResourcesDomainKey) {
                 ResourceNavigateResponse = MakeRequestSchemeCacheNavigate(TPathId(entry.DomainInfo->ResourcesDomainKey));
                 Become(&TViewerPipeClient::StateResolveResource);
-                return;
+            } else {
+                DatabaseBoardInfoResponse = MakeRequestStateStorageEndpointsLookup(CanonizePath(entry.Path));
             }
-            DatabaseBoardInfoResponse = MakeRequestStateStorageEndpointsLookup(CanonizePath(entry.Path));
         } else {
-            ReplyAndPassAway(GetHTTPBADREQUEST("text/plain", "Failed to resolve database - not found"));
+            return ReplyAndPassAway(GetHTTPBADREQUEST("text/plain", "Failed to resolve database - not found"));
         }
     }
+    RequestDone();
 }
 
 void TViewerPipeClient::HandleResolve(TEvStateStorage::TEvBoardInfo::TPtr& ev) {
     if (DatabaseBoardInfoResponse) {
         DatabaseBoardInfoResponse->Set(std::move(ev));
         if (DatabaseBoardInfoResponse->IsOk()) {
-            ReplyAndPassAway(MakeForward(GetNodesFromBoardReply(DatabaseBoardInfoResponse->GetRef())));
+            return ReplyAndPassAway(MakeForward(GetNodesFromBoardReply(DatabaseBoardInfoResponse->GetRef())));
         } else {
-            ReplyAndPassAway(GetHTTPBADREQUEST("text/plain", "Failed to resolve database - no nodes found"));
+            Direct = true;
+            Bootstrap(); // retry bootstrap without redirect this time
         }
     }
+    RequestDone();
 }
 
 void TViewerPipeClient::HandleTimeout() {
diff --git a/ydb/core/viewer/viewer_tabletinfo.h b/ydb/core/viewer/viewer_tabletinfo.h
@@ -87,8 +87,11 @@ class TJsonTabletInfo : public TJsonWhiteboardRequest<TEvWhiteboard::TEvTabletSt
         }
         const auto& params(Event->Get()->Request.GetParams());
         TBase::RequestSettings.Timeout = FromStringWithDefault<ui32>(params.Get("timeout"), 10000);
-        if (Database) {
-            RegisterWithSameMailbox(CreateBoardLookupActor(MakeEndpointsBoardPath(Database), TBase::SelfId(), EBoardLookupMode::Second));
+
+        if (DatabaseBoardInfoResponse && DatabaseBoardInfoResponse->IsOk()) {
+            TBase::RequestSettings.FilterNodeIds = TBase::GetNodesFromBoardReply(DatabaseBoardInfoResponse->GetRef());
+        } else if (Database) {
+            RequestStateStorageEndpointsLookup(Database);
             Become(&TThis::StateRequestedLookup, TDuration::MilliSeconds(TBase::RequestSettings.Timeout), new TEvents::TEvWakeup());
             return;
         }
@@ -102,13 +105,7 @@ class TJsonTabletInfo : public TJsonWhiteboardRequest<TEvWhiteboard::TEvTabletSt
         if (params.Has("path")) {
             TBase::RequestSettings.Timeout = FromStringWithDefault<ui32>(params.Get("timeout"), 10000);
             IsBase64Encode = FromStringWithDefault<bool>(params.Get("base64"), IsBase64Encode);
-            THolder<TEvTxUserProxy::TEvNavigate> request(new TEvTxUserProxy::TEvNavigate());
-            if (!Event->Get()->UserToken.empty()) {
-                request->Record.SetUserToken(Event->Get()->UserToken);
-            }
-            NKikimrSchemeOp::TDescribePath* record = request->Record.MutableDescribePath();
-            record->SetPath(params.Get("path"));
-            TBase::Send(MakeTxProxyID(), request.Release());
+            RequestTxProxyDescribe(params.Get("path"));
             Become(&TThis::StateRequestedDescribe, TDuration::MilliSeconds(TBase::RequestSettings.Timeout), new TEvents::TEvWakeup());
         } else {
             TBase::Bootstrap();
@@ -133,6 +130,7 @@ class TJsonTabletInfo : public TJsonWhiteboardRequest<TEvWhiteboard::TEvTabletSt
     void Handle(TEvStateStorage::TEvBoardInfo::TPtr& ev) {
         TBase::RequestSettings.FilterNodeIds = TBase::GetNodesFromBoardReply(ev);
         CheckPath();
+        RequestDone();
     }
 
     TString GetColumnValue(const TCell& cell, const NKikimrSchemeOp::TColumnDescription& type) {
@@ -322,14 +320,13 @@ class TJsonTabletInfo : public TJsonWhiteboardRequest<TEvWhiteboard::TEvTabletSt
                 }
             }
         }
-        if (Tablets.empty()) {
-            ReplyAndPassAway();
-        } else {
+        if (!Tablets.empty()) {
             TBase::Bootstrap();
             for (auto tablet : Tablets) {
                 Request->Record.AddFilterTabletId(tablet.first);
             }
         }
+        RequestDone();
     }
 
     virtual void FilterResponse(NKikimrWhiteboard::TEvTabletStateResponse& response) override {

Original file line number	Diff line number	Diff line change
`@@ -564,6 +564,9 @@ TViewerPipeClient::TRequestResponse<TEvTxProxySchemeCache::TEvNavigateKeySetResu`
`564`	`564`	`void TViewerPipeClient::RequestTxProxyDescribe(const TString& path) {`
`565`	`565`	`THolder<TEvTxUserProxy::TEvNavigate> request(new TEvTxUserProxy::TEvNavigate());`
`566`	`566`	`request->Record.MutableDescribePath()->SetPath(path);`
	`567`	`+ if (!Event->Get()->UserToken.empty()) {`
	`568`	`+ request->Record.SetUserToken(Event->Get()->UserToken);`
	`569`	`+ }`
`567`	`570`	`SendRequest(MakeTxProxyID(), request.Release());`
`568`	`571`	`}`
`569`	`572`
`@@ -754,13 +757,15 @@ void TViewerPipeClient::HandleResolveResource(TEvTxProxySchemeCache::TEvNavigate`
`754`	`757`	`SharedDatabase = CanonizePath(entry.Path);`
`755`	`758`	`if (SharedDatabase == AppData()->TenantName) {`
`756`	`759`	`Direct = true;`
`757`		`- return Bootstrap(); // retry bootstrap without redirect this time`
	`760`	`+ Bootstrap(); // retry bootstrap without redirect this time`
	`761`	`+ } else {`
	`762`	`+ DatabaseBoardInfoResponse = MakeRequestStateStorageEndpointsLookup(SharedDatabase);`
`758`	`763`	`}`
`759`		`- DatabaseBoardInfoResponse = MakeRequestStateStorageEndpointsLookup(SharedDatabase);`
`760`	`764`	`} else {`
`761`		`- ReplyAndPassAway(GetHTTPBADREQUEST("text/plain", "Failed to resolve database - shared database not found"));`
	`765`	`+ return ReplyAndPassAway(GetHTTPBADREQUEST("text/plain", "Failed to resolve database - shared database not found"));`
`762`	`766`	`}`
`763`	`767`	`}`
	`768`	`+ RequestDone();`
`764`	`769`	`}`
`765`	`770`
`766`	`771`	`void TViewerPipeClient::HandleResolveDatabase(TEvTxProxySchemeCache::TEvNavigateKeySetResult::TPtr& ev) {`
`@@ -771,24 +776,27 @@ void TViewerPipeClient::HandleResolveDatabase(TEvTxProxySchemeCache::TEvNavigate`
`771`	`776`	`if (entry.DomainInfo && entry.DomainInfo->ResourcesDomainKey && entry.DomainInfo->DomainKey != entry.DomainInfo->ResourcesDomainKey) {`
`772`	`777`	`ResourceNavigateResponse = MakeRequestSchemeCacheNavigate(TPathId(entry.DomainInfo->ResourcesDomainKey));`
`773`	`778`	`Become(&TViewerPipeClient::StateResolveResource);`
`774`		`- return;`
	`779`	`+ } else {`
	`780`	`+ DatabaseBoardInfoResponse = MakeRequestStateStorageEndpointsLookup(CanonizePath(entry.Path));`
`775`	`781`	`}`
`776`		`- DatabaseBoardInfoResponse = MakeRequestStateStorageEndpointsLookup(CanonizePath(entry.Path));`
`777`	`782`	`} else {`
`778`		`- ReplyAndPassAway(GetHTTPBADREQUEST("text/plain", "Failed to resolve database - not found"));`
	`783`	`+ return ReplyAndPassAway(GetHTTPBADREQUEST("text/plain", "Failed to resolve database - not found"));`
`779`	`784`	`}`
`780`	`785`	`}`
	`786`	`+ RequestDone();`
`781`	`787`	`}`
`782`	`788`
`783`	`789`	`void TViewerPipeClient::HandleResolve(TEvStateStorage::TEvBoardInfo::TPtr& ev) {`
`784`	`790`	`if (DatabaseBoardInfoResponse) {`
`785`	`791`	`DatabaseBoardInfoResponse->Set(std::move(ev));`
`786`	`792`	`if (DatabaseBoardInfoResponse->IsOk()) {`
`787`		`- ReplyAndPassAway(MakeForward(GetNodesFromBoardReply(DatabaseBoardInfoResponse->GetRef())));`
	`793`	`+ return ReplyAndPassAway(MakeForward(GetNodesFromBoardReply(DatabaseBoardInfoResponse->GetRef())));`
`788`	`794`	`} else {`
`789`		`- ReplyAndPassAway(GetHTTPBADREQUEST("text/plain", "Failed to resolve database - no nodes found"));`
	`795`	`+ Direct = true;`
	`796`	`+ Bootstrap(); // retry bootstrap without redirect this time`
`790`	`797`	`}`
`791`	`798`	`}`
	`799`	`+ RequestDone();`
`792`	`800`	`}`
`793`	`801`
`794`	`802`	`void TViewerPipeClient::HandleTimeout() {`
Original file line number	Diff line number	Diff line change
`@@ -87,8 +87,11 @@ class TJsonTabletInfo : public TJsonWhiteboardRequest<TEvWhiteboard::TEvTabletSt`
`87`	`87`	`}`
`88`	`88`	`const auto& params(Event->Get()->Request.GetParams());`
`89`	`89`	`TBase::RequestSettings.Timeout = FromStringWithDefault<ui32>(params.Get("timeout"), 10000);`
`90`		`- if (Database) {`
`91`		`- RegisterWithSameMailbox(CreateBoardLookupActor(MakeEndpointsBoardPath(Database), TBase::SelfId(), EBoardLookupMode::Second));`
	`90`	`+`
	`91`	`+ if (DatabaseBoardInfoResponse && DatabaseBoardInfoResponse->IsOk()) {`
	`92`	`+ TBase::RequestSettings.FilterNodeIds = TBase::GetNodesFromBoardReply(DatabaseBoardInfoResponse->GetRef());`
	`93`	`+ } else if (Database) {`
	`94`	`+ RequestStateStorageEndpointsLookup(Database);`
`92`	`95`	`Become(&TThis::StateRequestedLookup, TDuration::MilliSeconds(TBase::RequestSettings.Timeout), new TEvents::TEvWakeup());`
`93`	`96`	`return;`
`94`	`97`	`}`
`@@ -102,13 +105,7 @@ class TJsonTabletInfo : public TJsonWhiteboardRequest<TEvWhiteboard::TEvTabletSt`
`102`	`105`	`if (params.Has("path")) {`
`103`	`106`	`TBase::RequestSettings.Timeout = FromStringWithDefault<ui32>(params.Get("timeout"), 10000);`
`104`	`107`	`IsBase64Encode = FromStringWithDefault<bool>(params.Get("base64"), IsBase64Encode);`
`105`		`- THolder<TEvTxUserProxy::TEvNavigate> request(new TEvTxUserProxy::TEvNavigate());`
`106`		`- if (!Event->Get()->UserToken.empty()) {`
`107`		`- request->Record.SetUserToken(Event->Get()->UserToken);`
`108`		`- }`
`109`		`- NKikimrSchemeOp::TDescribePath* record = request->Record.MutableDescribePath();`
`110`		`- record->SetPath(params.Get("path"));`
`111`		`- TBase::Send(MakeTxProxyID(), request.Release());`
	`108`	`+ RequestTxProxyDescribe(params.Get("path"));`
`112`	`109`	`Become(&TThis::StateRequestedDescribe, TDuration::MilliSeconds(TBase::RequestSettings.Timeout), new TEvents::TEvWakeup());`
`113`	`110`	`} else {`
`114`	`111`	`TBase::Bootstrap();`
`@@ -133,6 +130,7 @@ class TJsonTabletInfo : public TJsonWhiteboardRequest<TEvWhiteboard::TEvTabletSt`
`133`	`130`	`void Handle(TEvStateStorage::TEvBoardInfo::TPtr& ev) {`
`134`	`131`	`TBase::RequestSettings.FilterNodeIds = TBase::GetNodesFromBoardReply(ev);`
`135`	`132`	`CheckPath();`
	`133`	`+ RequestDone();`
`136`	`134`	`}`
`137`	`135`
`138`	`136`	`TString GetColumnValue(const TCell& cell, const NKikimrSchemeOp::TColumnDescription& type) {`
`@@ -322,14 +320,13 @@ class TJsonTabletInfo : public TJsonWhiteboardRequest<TEvWhiteboard::TEvTabletSt`
`322`	`320`	`}`
`323`	`321`	`}`
`324`	`322`	`}`
`325`		`- if (Tablets.empty()) {`
`326`		`- ReplyAndPassAway();`
`327`		`- } else {`
	`323`	`+ if (!Tablets.empty()) {`
`328`	`324`	`TBase::Bootstrap();`
`329`	`325`	`for (auto tablet : Tablets) {`
`330`	`326`	`Request->Record.AddFilterTabletId(tablet.first);`
`331`	`327`	`}`
`332`	`328`	`}`
	`329`	`+ RequestDone();`
`333`	`330`	`}`
`334`	`331`
`335`	`332`	`virtual void FilterResponse(NKikimrWhiteboard::TEvTabletStateResponse& response) override {`