Improve exception message for remote function failure (#6069)

Summary: Pull Request resolved: #6069 Improve exception message for remote function failure to increase debugability. Reviewed By: kgpai Differential Revision: D48212485 fbshipit-source-id: 0afd80e500beecafb5ba59b5dc471c83a7bb55be
facebookincubator · Aug 12, 2023 · 87cc5bc · 87cc5bc
1 parent c275968
commit 87cc5bc
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/velox/functions/remote/client/Remote.cpp b/velox/functions/remote/client/Remote.cpp
@@ -111,7 +111,16 @@ class RemoteFunction : public exec::VectorFunction {
     requestInputs->payload_ref() = rowVectorToIOBuf(
         remoteRowVector, rows.end(), *context.pool(), serde_.get());
 
-    thriftClient_->sync_invokeFunction(remoteResponse, request);
+    try {
+      thriftClient_->sync_invokeFunction(remoteResponse, request);
+    } catch (const std::exception& e) {
+      VELOX_FAIL(
+          "Error while executing remote function '{}' at '{}': {}",
+          functionName_,
+          location_.describe(),
+          e.what());
+    }
+
     auto outputRowVector = IOBufToRowVector(
         remoteResponse.get_result().get_payload(),
         ROW({outputType}),

diff --git a/velox/functions/remote/client/tests/RemoteFunctionTest.cpp b/velox/functions/remote/client/tests/RemoteFunctionTest.cpp
@@ -160,10 +160,10 @@ TEST_P(RemoteFunctionTest, connectionError) {
 
   // Check it throw and that the exception has the "connection refused"
   // substring.
-  EXPECT_THROW(func(), VeloxUserError);
+  EXPECT_THROW(func(), VeloxRuntimeError);
   try {
     func();
-  } catch (const VeloxUserError& e) {
+  } catch (const VeloxRuntimeError& e) {
     EXPECT_THAT(e.message(), testing::HasSubstr("Channel is !good()"));
   }
 }