fix(alibaba#10427): When the execution of handleServerRequest() encou…

…nters an exception, record the log and throw an exception, then quickly response to the server errResponse (alibaba#10770)
Bo-Qiu · Jul 13, 2023 · 156cd62 · 156cd62
1 parent 8fa83ce
commit 156cd62
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/common/src/main/java/com/alibaba/nacos/common/remote/client/RpcClient.java b/common/src/main/java/com/alibaba/nacos/common/remote/client/RpcClient.java
@@ -832,6 +832,7 @@ protected Response handleServerRequest(final Request request) {
             } catch (Exception e) {
                 LoggerUtils.printIfInfoEnabled(LOGGER, "[{}] HandleServerRequest:{}, errorMessage = {}",
                         rpcClientConfig.name(), serverRequestHandler.getClass().getName(), e.getMessage());
+                throw e;
             }
 
         }

diff --git a/common/src/test/java/com/alibaba/nacos/common/remote/client/RpcClientTest.java b/common/src/test/java/com/alibaba/nacos/common/remote/client/RpcClientTest.java
@@ -635,4 +635,19 @@ public ServerInfo nextRpcServer() {
             }
         };
     }
+
+    @Test(expected = RuntimeException.class)
+    public void testHandleServerRequestWhenExceptionThenThrowException() throws RuntimeException {
+        RpcClient rpcClient = buildTestNextRpcServerClient();
+        Request request = new Request() {
+            @Override
+            public String getModule() {
+                return null;
+            }
+        };
+        rpcClient.serverRequestHandlers.add(req -> {
+            throw new RuntimeException();
+        });
+        rpcClient.handleServerRequest(request);
+    }
 }