client aware server list change (#5952)

alibaba · Jun 4, 2021 · de6a4b8 · de6a4b8
1 parent 55c6f44
commit de6a4b8
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 0 deletions.
diff --git a/client/src/main/java/com/alibaba/nacos/client/config/impl/ClientWorker.java b/client/src/main/java/com/alibaba/nacos/client/config/impl/ClientWorker.java
@@ -49,6 +49,9 @@
 import com.alibaba.nacos.client.utils.ParamUtil;
 import com.alibaba.nacos.client.utils.TenantUtil;
 import com.alibaba.nacos.common.lifecycle.Closeable;
+import com.alibaba.nacos.common.notify.Event;
+import com.alibaba.nacos.common.notify.NotifyCenter;
+import com.alibaba.nacos.common.notify.listener.Subscriber;
 import com.alibaba.nacos.common.remote.ConnectionType;
 import com.alibaba.nacos.common.remote.client.ConnectionEventListener;
 import com.alibaba.nacos.common.remote.client.RpcClient;
@@ -699,6 +702,18 @@ public List<String> getServerList() {
 
                 }
             });
+
+            NotifyCenter.registerSubscriber(new Subscriber() {
+                @Override
+                public void onEvent(Event event) {
+                    rpcClientInner.onServerListChange();
+                }
+
+                @Override
+                public Class<? extends Event> subscribeType() {
+                    return ServerlistChangeEvent.class;
+                }
+            });
         }
 
         @Override

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
@@ -243,6 +243,29 @@ public boolean isShutdown() {
         return this.rpcClientStatus.get() == RpcClientStatus.SHUTDOWN;
     }
 
+    /**
+     * check if current connected server is in serverlist ,if not switch server.
+     */
+    public void onServerListChange() {
+        if (currentConnection != null && currentConnection.serverInfo != null) {
+            ServerInfo serverInfo = currentConnection.serverInfo;
+            boolean found = false;
+            for (String serverAddress : serverListFactory.getServerList()) {
+                if (resolveServerInfo(serverAddress).getAddress().equalsIgnoreCase(serverInfo.getAddress())) {
+                    found = true;
+                    break;
+                }
+            }
+            if (!found) {
+                LoggerUtils.printIfInfoEnabled(LOGGER,
+                        "Current connected server {}  is not in latest server list,switch switchServerAsync",
+                        serverInfo.getAddress());
+                switchServerAsync();
+            }
+
+        }
+    }
+
     /**
      * Start this client.
      */