Backport 2.7, lazy connection warn log (#8329)

apache · Jul 23, 2021 · 5e68e43 · 5e68e43
1 parent 3f1e3f4
commit 5e68e43
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/...rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/DubboProtocol.java b/...rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/DubboProtocol.java
@@ -437,6 +437,9 @@ public void destroy() {
                 }
             }
         }
+        // put here to reduce the chance of accepting new invocation after client closed.
+        // close invoker and then client.
+        super.destroy();
 
         for (String key : new ArrayList<String>(referenceClientMap.keySet())) {
             ExchangeClient client = referenceClientMap.remove(key);
@@ -466,6 +469,5 @@ public void destroy() {
             }
         }
         stubServiceMethodsMap.clear();
-        super.destroy();
     }
 }
diff --git a/...c-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/LazyConnectExchangeClient.java b/...c-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/LazyConnectExchangeClient.java
@@ -115,7 +115,7 @@ public ResponseFuture request(Object request, int timeout) throws RemotingExcept
     private void warning(Object request) {
         if (requestWithWarning) {
             if (warningcount.get() % 5000 == 0) {
-                logger.warn(new IllegalStateException("safe guard client , should not be called ,must have a bug."));
+                logger.warn(url.getAddress() + " " + url.getServiceKey() + " safe guard client get called after real client closed, recreating connection...");
             }
             warningcount.incrementAndGet();
         }

diff --git a/...ubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/ReferenceCountExchangeClient.java b/...ubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/ReferenceCountExchangeClient.java
@@ -167,11 +167,9 @@ public void startClose() {
     private LazyConnectExchangeClient replaceWithLazyClient() {
         // this is a defensive operation to avoid client is closed by accident, the initial state of the client is false
         URL lazyUrl = url.addParameter(Constants.LAZY_CONNECT_INITIAL_STATE_KEY, Boolean.TRUE)
-                .addParameter(Constants.RECONNECT_KEY, Boolean.FALSE)
                 .addParameter(Constants.SEND_RECONNECT_KEY, Boolean.TRUE.toString())
-                .addParameter("warning", Boolean.TRUE.toString())
-                .addParameter(LazyConnectExchangeClient.REQUEST_WITH_WARNING_KEY, true)
-                .addParameter("_client_memo", "referencecounthandler.replacewithlazyclient");
+                .addParameter(LazyConnectExchangeClient.REQUEST_WITH_WARNING_KEY, true);
+
 
         String key = url.getAddress();
         // in worst case there's only one ghost connection.

diff --git a/.../src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/ReferenceCountExchangeClientTest.java b/.../src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/ReferenceCountExchangeClientTest.java
@@ -26,7 +26,6 @@
 import com.alibaba.dubbo.rpc.Exporter;
 import com.alibaba.dubbo.rpc.Invoker;
 import com.alibaba.dubbo.rpc.ProxyFactory;
-
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.BeforeClass;
@@ -46,7 +45,7 @@ public class ReferenceCountExchangeClientTest {
     IHelloService helloService;
     ExchangeClient demoClient;
     ExchangeClient helloClient;
-    String errorMsg = "safe guard client , should not be called ,must have a bug";
+    String errorMsg = "safe guard client";
 
     @BeforeClass
     public static void setUpBeforeClass() throws Exception {