get all nacos instances without subscription (#15126)

zrlw · web-flow · commit 3627fdbfce87 · 2025-02-13T18:52:56.000+08:00
diff --git a/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosNamingServiceWrapper.java b/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosNamingServiceWrapper.java
@@ -110,9 +110,10 @@ public void unsubscribe(String serviceName, String group, EventListener eventLis
         }
     }
 
-    public List<Instance> getAllInstances(String serviceName, String group) throws NacosException {
-        return apply(
-                () -> nacosConnectionManager.getNamingService().getAllInstances(handleInnerSymbol(serviceName), group));
+    public List<Instance> getAllInstancesWithoutSubscription(String serviceName, String group) throws NacosException {
+        return apply(() -> nacosConnectionManager
+                .getNamingService()
+                .getAllInstances(handleInnerSymbol(serviceName), group, false));
     }
 
     public void registerInstance(String serviceName, String group, Instance instance) throws NacosException {
diff --git a/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosRegistry.java b/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosRegistry.java
@@ -158,8 +158,8 @@ public List<URL> lookup(final URL url) {
             List<URL> urls = new LinkedList<>();
             Set<String> serviceNames = getServiceNames(url, null);
             for (String serviceName : serviceNames) {
-                List<Instance> instances =
-                        namingService.getAllInstances(serviceName, getUrl().getGroup(Constants.DEFAULT_GROUP));
+                List<Instance> instances = namingService.getAllInstancesWithoutSubscription(
+                        serviceName, getUrl().getGroup(Constants.DEFAULT_GROUP));
                 urls.addAll(buildURLs(url, instances));
             }
             return urls;
@@ -267,8 +267,8 @@ private void doSubscribe(final URL url, final NacosAggregateListener listener, f
                  * in https://github.com/apache/dubbo/issues/5978
                  */
                 for (String serviceName : serviceNames) {
-                    List<Instance> instances =
-                            namingService.getAllInstances(serviceName, getUrl().getGroup(Constants.DEFAULT_GROUP));
+                    List<Instance> instances = namingService.getAllInstancesWithoutSubscription(
+                            serviceName, getUrl().getGroup(Constants.DEFAULT_GROUP));
                     notifySubscriber(url, serviceName, listener, instances);
                 }
                 for (String serviceName : serviceNames) {
@@ -277,8 +277,8 @@ private void doSubscribe(final URL url, final NacosAggregateListener listener, f
             } else {
                 for (String serviceName : serviceNames) {
                     List<Instance> instances = new LinkedList<>();
-                    instances.addAll(
-                            namingService.getAllInstances(serviceName, getUrl().getGroup(Constants.DEFAULT_GROUP)));
+                    instances.addAll(namingService.getAllInstancesWithoutSubscription(
+                            serviceName, getUrl().getGroup(Constants.DEFAULT_GROUP)));
                     String serviceInterface = serviceName;
                     String[] segments = serviceName.split(SERVICE_NAME_SEPARATOR, -1);
                     if (segments.length == 4) {
diff --git a/dubbo-registry/dubbo-registry-nacos/src/test/java/org/apache/dubbo/registry/nacos/MockNamingService.java b/dubbo-registry/dubbo-registry-nacos/src/test/java/org/apache/dubbo/registry/nacos/MockNamingService.java
@@ -86,7 +86,8 @@ public List<Instance> getAllInstances(String serviceName, boolean subscribe) thr
     }
 
     @Override
-    public List<Instance> getAllInstances(String serviceName, String groupName, boolean subscribe) {
+    public List<Instance> getAllInstances(String serviceName, String groupName, boolean subscribe)
+            throws NacosException {
         return null;
     }
 
diff --git a/dubbo-registry/dubbo-registry-nacos/src/test/java/org/apache/dubbo/registry/nacos/NacosNamingServiceWrapperTest.java b/dubbo-registry/dubbo-registry-nacos/src/test/java/org/apache/dubbo/registry/nacos/NacosNamingServiceWrapperTest.java
@@ -661,7 +661,7 @@ void testSuccess() {
             public void registerInstance(String serviceName, String groupName, Instance instance) {}
 
             @Override
-            public List<Instance> getAllInstances(String serviceName, String groupName) {
+            public List<Instance> getAllInstances(String serviceName, String groupName, boolean subscribe) {
                 return null;
             }
         };
@@ -674,7 +674,7 @@ public List<Instance> getAllInstances(String serviceName, String groupName) {
             Assertions.fail(e);
         }
         try {
-            nacosNamingServiceWrapper.getAllInstances("Test", "Test");
+            nacosNamingServiceWrapper.getAllInstancesWithoutSubscription("Test", "Test");
         } catch (NacosException e) {
             Assertions.fail(e);
         }
@@ -690,7 +690,8 @@ public void registerInstance(String serviceName, String groupName, Instance inst
             }
 
             @Override
-            public List<Instance> getAllInstances(String serviceName, String groupName) throws NacosException {
+            public List<Instance> getAllInstances(String serviceName, String groupName, boolean subscribe)
+                    throws NacosException {
                 throw new NacosException();
             }
         };
@@ -699,7 +700,9 @@ public List<Instance> getAllInstances(String serviceName, String groupName) thro
                 new NacosNamingServiceWrapper(new NacosConnectionManager(namingService), 0, 0);
         Assertions.assertThrows(
                 NacosException.class, () -> nacosNamingServiceWrapper.registerInstance("Test", "Test", null));
-        Assertions.assertThrows(NacosException.class, () -> nacosNamingServiceWrapper.getAllInstances("Test", "Test"));
+        Assertions.assertThrows(
+                NacosException.class,
+                () -> nacosNamingServiceWrapper.getAllInstancesWithoutSubscription("Test", "Test"));
     }
 
     @Test
@@ -717,7 +720,8 @@ public void registerInstance(String serviceName, String groupName, Instance inst
             }
 
             @Override
-            public List<Instance> getAllInstances(String serviceName, String groupName) throws NacosException {
+            public List<Instance> getAllInstances(String serviceName, String groupName, boolean subscribe)
+                    throws NacosException {
                 if (count2.incrementAndGet() < 10) {
                     throw new NacosException();
                 }
@@ -735,9 +739,11 @@ public List<Instance> getAllInstances(String serviceName, String groupName) thro
             Assertions.fail(e);
         }
 
-        Assertions.assertThrows(NacosException.class, () -> nacosNamingServiceWrapper.getAllInstances("Test", "Test"));
+        Assertions.assertThrows(
+                NacosException.class,
+                () -> nacosNamingServiceWrapper.getAllInstancesWithoutSubscription("Test", "Test"));
         try {
-            nacosNamingServiceWrapper.getAllInstances("Test", "Test");
+            nacosNamingServiceWrapper.getAllInstancesWithoutSubscription("Test", "Test");
         } catch (NacosException e) {
             Assertions.fail(e);
         }

Original file line number	Diff line number	Diff line change
`@@ -110,9 +110,10 @@ public void unsubscribe(String serviceName, String group, EventListener eventLis`
`110`	`110`	`}`
`111`	`111`	`}`
`112`	`112`
`113`		`- public List<Instance> getAllInstances(String serviceName, String group) throws NacosException {`
`114`		`- return apply(`
`115`		`- () -> nacosConnectionManager.getNamingService().getAllInstances(handleInnerSymbol(serviceName), group));`
	`113`	`+ public List<Instance> getAllInstancesWithoutSubscription(String serviceName, String group) throws NacosException {`
	`114`	`+ return apply(() -> nacosConnectionManager`
	`115`	`+ .getNamingService()`
	`116`	`+ .getAllInstances(handleInnerSymbol(serviceName), group, false));`
`116`	`117`	`}`
`117`	`118`
`118`	`119`	`public void registerInstance(String serviceName, String group, Instance instance) throws NacosException {`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,8 @@ public List<Instance> getAllInstances(String serviceName, boolean subscribe) thr`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`@Override`
`89`		`- public List<Instance> getAllInstances(String serviceName, String groupName, boolean subscribe) {`
	`89`	`+ public List<Instance> getAllInstances(String serviceName, String groupName, boolean subscribe)`
	`90`	`+ throws NacosException {`
`90`	`91`	`return null;`
`91`	`92`	`}`
`92`	`93`
Original file line number	Diff line number	Diff line change
`@@ -661,7 +661,7 @@ void testSuccess() {`
`661`	`661`	`public void registerInstance(String serviceName, String groupName, Instance instance) {}`
`662`	`662`
`663`	`663`	`@Override`
`664`		`- public List<Instance> getAllInstances(String serviceName, String groupName) {`
	`664`	`+ public List<Instance> getAllInstances(String serviceName, String groupName, boolean subscribe) {`
`665`	`665`	`return null;`
`666`	`666`	`}`
`667`	`667`	`};`
`@@ -674,7 +674,7 @@ public List<Instance> getAllInstances(String serviceName, String groupName) {`
`674`	`674`	`Assertions.fail(e);`
`675`	`675`	`}`
`676`	`676`	`try {`
`677`		`- nacosNamingServiceWrapper.getAllInstances("Test", "Test");`
	`677`	`+ nacosNamingServiceWrapper.getAllInstancesWithoutSubscription("Test", "Test");`
`678`	`678`	`} catch (NacosException e) {`
`679`	`679`	`Assertions.fail(e);`
`680`	`680`	`}`
`@@ -690,7 +690,8 @@ public void registerInstance(String serviceName, String groupName, Instance inst`
`690`	`690`	`}`
`691`	`691`
`692`	`692`	`@Override`
`693`		`- public List<Instance> getAllInstances(String serviceName, String groupName) throws NacosException {`
	`693`	`+ public List<Instance> getAllInstances(String serviceName, String groupName, boolean subscribe)`
	`694`	`+ throws NacosException {`
`694`	`695`	`throw new NacosException();`
`695`	`696`	`}`
`696`	`697`	`};`
`@@ -699,7 +700,9 @@ public List<Instance> getAllInstances(String serviceName, String groupName) thro`
`699`	`700`	`new NacosNamingServiceWrapper(new NacosConnectionManager(namingService), 0, 0);`
`700`	`701`	`Assertions.assertThrows(`
`701`	`702`	`NacosException.class, () -> nacosNamingServiceWrapper.registerInstance("Test", "Test", null));`
`702`		`- Assertions.assertThrows(NacosException.class, () -> nacosNamingServiceWrapper.getAllInstances("Test", "Test"));`
	`703`	`+ Assertions.assertThrows(`
	`704`	`+ NacosException.class,`
	`705`	`+ () -> nacosNamingServiceWrapper.getAllInstancesWithoutSubscription("Test", "Test"));`
`703`	`706`	`}`
`704`	`707`
`705`	`708`	`@Test`
`@@ -717,7 +720,8 @@ public void registerInstance(String serviceName, String groupName, Instance inst`
`717`	`720`	`}`
`718`	`721`
`719`	`722`	`@Override`
`720`		`- public List<Instance> getAllInstances(String serviceName, String groupName) throws NacosException {`
	`723`	`+ public List<Instance> getAllInstances(String serviceName, String groupName, boolean subscribe)`
	`724`	`+ throws NacosException {`
`721`	`725`	`if (count2.incrementAndGet() < 10) {`
`722`	`726`	`throw new NacosException();`
`723`	`727`	`}`
`@@ -735,9 +739,11 @@ public List<Instance> getAllInstances(String serviceName, String groupName) thro`
`735`	`739`	`Assertions.fail(e);`
`736`	`740`	`}`
`737`	`741`
`738`		`- Assertions.assertThrows(NacosException.class, () -> nacosNamingServiceWrapper.getAllInstances("Test", "Test"));`
	`742`	`+ Assertions.assertThrows(`
	`743`	`+ NacosException.class,`
	`744`	`+ () -> nacosNamingServiceWrapper.getAllInstancesWithoutSubscription("Test", "Test"));`
`739`	`745`	`try {`
`740`		`- nacosNamingServiceWrapper.getAllInstances("Test", "Test");`
	`746`	`+ nacosNamingServiceWrapper.getAllInstancesWithoutSubscription("Test", "Test");`
`741`	`747`	`} catch (NacosException e) {`
`742`	`748`	`Assertions.fail(e);`
`743`	`749`	`}`