[ISSUE alibaba#6019] Support fetching server list from endpoint with …

…namespace. (alibaba#6020)
proXsp · Jun 9, 2021 · 0d63616 · 0d63616
1 parent 13fe9a8
commit 0d63616
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/client/src/main/java/com/alibaba/nacos/client/naming/NacosNamingMaintainService.java b/client/src/main/java/com/alibaba/nacos/client/naming/NacosNamingMaintainService.java
@@ -63,7 +63,7 @@ private void init(Properties properties) throws NacosException {
         namespace = InitUtils.initNamespaceForNaming(properties);
         InitUtils.initSerialization();
         InitUtils.initWebRootContext(properties);
-        ServerListManager serverListManager = new ServerListManager(properties);
+        ServerListManager serverListManager = new ServerListManager(properties, namespace);
         SecurityProxy securityProxy = new SecurityProxy(properties,
                 NamingHttpClientManager.getInstance().getNacosRestTemplate());
         serverProxy = new NamingHttpClientProxy(namespace, securityProxy, serverListManager, properties, null);

diff --git a/client/src/main/java/com/alibaba/nacos/client/naming/core/ServerListManager.java b/client/src/main/java/com/alibaba/nacos/client/naming/core/ServerListManager.java
@@ -60,6 +60,8 @@ public class ServerListManager implements ServerListFactory, Closeable {
 
     private final long refreshServerListInternal = TimeUnit.SECONDS.toMillis(30);
 
+    private final String namespace;
+
     private final AtomicInteger currentIndex = new AtomicInteger();
 
     private final List<String> serverList = new ArrayList<>();
@@ -75,6 +77,11 @@ public class ServerListManager implements ServerListFactory, Closeable {
     private long lastServerListRefreshTime = 0L;
 
     public ServerListManager(Properties properties) {
+        this(properties, null);
+    }
+
+    public ServerListManager(Properties properties, String namespace) {
+        this.namespace = namespace;
         initServerAddr(properties);
         if (!serverList.isEmpty()) {
             currentIndex.set(new Random().nextInt(serverList.size()));
@@ -105,7 +112,10 @@ private List<String> getServerListFromEndpoint() {
         try {
             String urlString = "http://" + endpoint + "/nacos/serverlist";
             Header header = NamingHttpUtil.builderHeader();
-            HttpRestResult<String> restResult = nacosRestTemplate.get(urlString, header, Query.EMPTY, String.class);
+            Query query = StringUtils.isNotBlank(namespace)
+                    ? Query.newInstance().addParam("namespace", namespace)
+                    : Query.EMPTY;
+            HttpRestResult<String> restResult = nacosRestTemplate.get(urlString, header, query, String.class);
             if (!restResult.ok()) {
                 throw new IOException(
                         "Error while requesting: " + urlString + "'. Server returned: " + restResult.getCode());

diff --git a/client/src/main/java/com/alibaba/nacos/client/naming/remote/NamingClientProxyDelegate.java b/client/src/main/java/com/alibaba/nacos/client/naming/remote/NamingClientProxyDelegate.java
@@ -68,7 +68,7 @@ public NamingClientProxyDelegate(String namespace, ServiceInfoHolder serviceInfo
             InstancesChangeNotifier changeNotifier) throws NacosException {
         this.serviceInfoUpdateService = new ServiceInfoUpdateService(properties, serviceInfoHolder, this,
                 changeNotifier);
-        this.serverListManager = new ServerListManager(properties);
+        this.serverListManager = new ServerListManager(properties, namespace);
         this.serviceInfoHolder = serviceInfoHolder;
         this.securityProxy = new SecurityProxy(properties, NamingHttpClientManager.getInstance().getNacosRestTemplate());
         initSecurityProxy();