[Dubbo-6567] fix consumer warning "safe guard client , should not be called ,must have a bug."

dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/Constants.java

@@ -49,17 +49,22 @@ public interface Constants {
     String CHANNEL_CALLBACK_KEY = "channel.callback.invokers.key";
 
     /**
-     * The initial state for lazy connection
+     * The initial connect state for lazy connection
      */
     String LAZY_CONNECT_INITIAL_STATE_KEY = "connect.lazy.initial.state";
 
     /**
-     * The default value of lazy connection's initial state: true
+     * The default value of lazy connection's initial connect state: true
      *
      * @see #LAZY_CONNECT_INITIAL_STATE_KEY
      */
     boolean DEFAULT_LAZY_CONNECT_INITIAL_STATE = true;
 
+    /**
+     * The close state for lazy connection
+     */
+    String LAZY_CLOSE_STATE_KEY = "close.lazy.state";
+
     String OPTIMIZER_KEY = "optimizer";
 
     String ON_CONNECT_KEY = "onconnect";

dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/LazyConnectExchangeClient.java

@@ -37,6 +37,7 @@
 import static org.apache.dubbo.remoting.Constants.SEND_RECONNECT_KEY;
 import static org.apache.dubbo.rpc.protocol.dubbo.Constants.DEFAULT_LAZY_CONNECT_INITIAL_STATE;
 import static org.apache.dubbo.rpc.protocol.dubbo.Constants.LAZY_CONNECT_INITIAL_STATE_KEY;
+import static org.apache.dubbo.rpc.protocol.dubbo.Constants.LAZY_CLOSE_STATE_KEY;
 
 /**
  * dubbo protocol support class.
@@ -57,15 +58,21 @@ final class LazyConnectExchangeClient implements ExchangeClient {
     /**
      * lazy connect, initial state for connection
      */
-    private final boolean initialState;
+    private final boolean initialConnectState;
+    private final Boolean closeState;
     private volatile ExchangeClient client;
     private AtomicLong warningcount = new AtomicLong(0);
 
     public LazyConnectExchangeClient(URL url, ExchangeHandler requestHandler) {
         // lazy connect, need set send.reconnect = true, to avoid channel bad status.
         this.url = url.addParameter(SEND_RECONNECT_KEY, Boolean.TRUE.toString());
         this.requestHandler = requestHandler;
-        this.initialState = url.getParameter(LAZY_CONNECT_INITIAL_STATE_KEY, DEFAULT_LAZY_CONNECT_INITIAL_STATE);
+        this.initialConnectState = url.getParameter(LAZY_CONNECT_INITIAL_STATE_KEY, DEFAULT_LAZY_CONNECT_INITIAL_STATE);
+        if (url.hasParameter(LAZY_CLOSE_STATE_KEY)) {
+            this.closeState = Boolean.parseBoolean(url.getParameter(LAZY_CLOSE_STATE_KEY));
+        } else {
+            this.closeState = null;
+        }
         this.requestWithWarning = url.getParameter(REQUEST_WITH_WARNING_KEY, false);
     }
 
@@ -150,7 +157,7 @@ public ChannelHandler getChannelHandler() {
     @Override
     public boolean isConnected() {
         if (client == null) {
-            return initialState;
+            return initialConnectState;
         } else {
             return client.isConnected();
         }
@@ -184,10 +191,14 @@ public void send(Object message, boolean sent) throws RemotingException {
 
     @Override
     public boolean isClosed() {
-        if (client != null) {
-            return client.isClosed();
-        } else {
+        if (closeState != null) {
+            return closeState;
+        }
+
+        if (client == null) {
             return false;
+        } else {
+            return client.isClosed();
         }
     }
 

dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/ReferenceCountExchangeClient.java

@@ -30,6 +30,7 @@
 import java.util.concurrent.atomic.AtomicInteger;
 
 import static org.apache.dubbo.remoting.Constants.SEND_RECONNECT_KEY;
+import static org.apache.dubbo.rpc.protocol.dubbo.Constants.LAZY_CLOSE_STATE_KEY;
 import static org.apache.dubbo.rpc.protocol.dubbo.Constants.LAZY_CONNECT_INITIAL_STATE_KEY;
 
 /**
@@ -180,6 +181,7 @@ public void startClose() {
     private void 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(LAZY_CONNECT_INITIAL_STATE_KEY, Boolean.TRUE)
+                .addParameter(LAZY_CLOSE_STATE_KEY, Boolean.TRUE)
                 //.addParameter(RECONNECT_KEY, Boolean.FALSE)
                 .addParameter(SEND_RECONNECT_KEY, Boolean.TRUE.toString())
                 .addParameter(LazyConnectExchangeClient.REQUEST_WITH_WARNING_KEY, true);