Fix DefaultFuture turn off exception logging optimization for Channel (…

…#8695)
apache · Sep 9, 2021 · 1611a9e · 1611a9e
1 parent 13c15fd
commit 1611a9e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/...-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/support/DefaultFuture.java b/...-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/support/DefaultFuture.java
@@ -147,7 +147,7 @@ public static void closeChannel(Channel channel) {
                     disconnectResponse.setErrorMessage("Channel " +
                             channel +
                             " is inactive. Directly return the unFinished request : " +
-                            future.getRequest());
+                            rinseRequestData(future.getRequest()));
                     DefaultFuture.received(channel, disconnectResponse);
                 }
             }
@@ -251,11 +251,11 @@ private String getTimeoutMessage(boolean scan) {
                 + (sent > 0 ? " client elapsed: " + (sent - start)
                 + " ms, server elapsed: " + (nowTimestamp - sent)
                 : " elapsed: " + (nowTimestamp - start)) + " ms, timeout: "
-                + timeout + " ms, request: " + (logger.isDebugEnabled() ? request : getRequestWithoutData()) + ", channel: " + channel.getLocalAddress()
+                + timeout + " ms, request: " + (logger.isDebugEnabled() ? request : rinseRequestData(request)) + ", channel: " + channel.getLocalAddress()
                 + " -> " + channel.getRemoteAddress();
     }
 
-    private Request getRequestWithoutData() {
+    private static Request rinseRequestData(Request request) {
         Request newRequest = request.copy();
         newRequest.setData(null);
         return newRequest;

diff --git a/...est/java/org/apache/dubbo/remoting/exchange/support/header/HeaderExchangeChannelTest.java b/...est/java/org/apache/dubbo/remoting/exchange/support/header/HeaderExchangeChannelTest.java
@@ -16,6 +16,8 @@
  */
 package org.apache.dubbo.remoting.exchange.support.header;
 
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
 import org.apache.dubbo.common.URL;
 import org.apache.dubbo.remoting.Channel;
 import org.apache.dubbo.remoting.RemotingException;
@@ -187,6 +189,17 @@ public void closeTest() {
     }
 
 
+    @Test
+    public void closeExecptionMsgTest() throws RemotingException {
+        Object request = new Object();
+        CompletableFuture<Object> future = header.request(request);
+        header.close();
+        ExecutionException executionException = Assertions.assertThrows(ExecutionException.class, () -> future.get());
+        String message = executionException.getMessage();
+        Assertions.assertTrue(message.contains("data=null"));
+    }
+
+
     @Test
     public void closeWithTimeoutTest02() {
         Assertions.assertFalse(channel.isClosed());