fallback on bad request proxying (ydb-platform#4566)

MrLolthe1st · May 28, 2024 · cf69bc8 · cf69bc8
1 parent 6efe6f4
commit cf69bc8
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/ydb/core/viewer/json_autocomplete.h b/ydb/core/viewer/json_autocomplete.h
@@ -425,7 +425,12 @@ class TJsonAutocomplete : public TViewerPipeClient<TJsonAutocomplete> {
     }
 
     void Handle(TEvViewer::TEvViewerResponse::TPtr& ev) {
-        ProxyResult = ev.Release()->Release();
+        if (ev.Get()->Get()->Record.HasAutocompleteResponse()) {
+            ProxyResult = ev.Release()->Release();
+        } else {
+            Direct = true;
+            SendSchemeCacheRequest(); // fallback
+        }
         RequestDone();
     }
 

diff --git a/ydb/core/viewer/json_query.h b/ydb/core/viewer/json_query.h
@@ -420,7 +420,12 @@ class TJsonQuery : public TViewerPipeClient<TJsonQuery> {
     }
 
     void HandleReply(TEvViewer::TEvViewerResponse::TPtr& ev) {
-        Handle(*(ev.Get()->Get()->Record.MutableQueryResponse()));
+        auto& record = ev.Get()->Get()->Record;
+        if (record.HasQueryResponse()) {
+            Handle(*(ev.Get()->Get()->Record.MutableQueryResponse()));
+        } else {
+            SendKpqProxyRequest(); // fallback
+        }
     }
 
     void HandleReply(NKqp::TEvKqp::TEvAbortExecution::TPtr& ev) {

diff --git a/ydb/core/viewer/json_render.h b/ydb/core/viewer/json_render.h
@@ -254,7 +254,12 @@ class TJsonRender : public TViewerPipeClient<TJsonRender> {
     }
 
     void Handle(TEvViewer::TEvViewerResponse::TPtr& ev) {
-        HandleRenderResponse(*(ev.Get()->Get()->Record.MutableRenderResponse()));
+        auto& record = ev.Get()->Get()->Record;
+        if (record.HasRenderResponse()) {
+            HandleRenderResponse(*(record.MutableRenderResponse()));
+        } else {
+            SendGraphRequest(); // fallback
+        }
     }
 
     void HandleTimeout() {