diff options
| -rw-r--r-- | ydb/core/viewer/json_pipe_req.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/ydb/core/viewer/json_pipe_req.cpp b/ydb/core/viewer/json_pipe_req.cpp index 7c6ba74a792..9ce9b8e3df7 100644 --- a/ydb/core/viewer/json_pipe_req.cpp +++ b/ydb/core/viewer/json_pipe_req.cpp @@ -760,11 +760,13 @@ void TViewerPipeClient::RedirectToDatabase(const TString& database) { } bool TViewerPipeClient::NeedToRedirect() { - 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) { - RedirectToDatabase(Database); // to find some dynamic node and redirect query there - return true; + if (Event) { + 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) { + RedirectToDatabase(Database); // to find some dynamic node and redirect query there + return true; + } } return false; } |