do not fail in resolve state: catch exception and route that in internal error

1 files changed, 12 insertions, 7 deletions

diff --git a/ydb/core/kqp/executer/kqp_scan_executer.cpp b/ydb/core/kqp/executer/kqp_scan_executer.cpp
index f85b2f3d0e6..85eab7fbed6 100644
--- a/ydb/core/kqp/executer/kqp_scan_executer.cpp
+++ b/ydb/core/kqp/executer/kqp_scan_executer.cpp
@@ -73,13 +73,18 @@ public:
     TActorId KqpShardsResolverId;
 
     STATEFN(WaitResolveState) {
-        switch (ev->GetTypeRewrite()) {
-            hFunc(TEvKqpExecuter::TEvTableResolveStatus, HandleResolve);
-            hFunc(TEvKqpExecuter::TEvShardsResolveStatus, HandleResolve);
-            hFunc(TEvKqp::TEvAbortExecution, HandleAbortExecution);
-            hFunc(TEvents::TEvWakeup, HandleTimeout);
-            default:
-                UnexpectedEvent("WaitResolveState", ev->GetTypeRewrite());
+        try {
+            switch (ev->GetTypeRewrite()) {
+                hFunc(TEvKqpExecuter::TEvTableResolveStatus, HandleResolve);
+                hFunc(TEvKqpExecuter::TEvShardsResolveStatus, HandleResolve);
+                hFunc(TEvKqp::TEvAbortExecution, HandleAbortExecution);
+                hFunc(TEvents::TEvWakeup, HandleTimeout);
+                default:
+                    UnexpectedEvent("WaitResolveState", ev->GetTypeRewrite());
+            }
+
+        } catch (const yexception& e) {
+            InternalError(e.what());
         }
         ReportEventElapsedTime();
     }