fix:修复ServiceDiscovery在watch回调时没有正常过滤隔离实例 (#55)

polarismesh · Mar 1, 2024 · d16ec7a · d16ec7a
1 parent e7c5589
commit d16ec7a
Showing 1 changed file with 16 additions and 14 deletions.
diff --git a/...try-polaris/src/main/java/com/tencent/polaris/dubbo/registry/PolarisServiceDiscovery.java b/...try-polaris/src/main/java/com/tencent/polaris/dubbo/registry/PolarisServiceDiscovery.java
@@ -188,20 +188,22 @@ private InnerServiceListener(String service) {
         @Override
         public void onEvent(ServiceChangeEvent event) {
             String serviceName = event.getServiceKey().getService();
-            List<ServiceInstance> serviceInstances = event.getAllInstances()
-                    .stream()
-                    .map((Function<Instance, ServiceInstance>) instance -> {
-                        DefaultServiceInstance serviceInstance =
-                                new DefaultServiceInstance(
-                                        instance.getService(),
-                                        instance.getHost(), instance.getPort(),
-                                        ScopeModelUtil.getApplicationModel(registryURL.getScopeModel()));
-                        serviceInstance.setMetadata(instance.getMetadata());
-                        serviceInstance.setEnabled(!instance.isIsolated());
-                        serviceInstance.setHealthy(instance.isHealthy());
-                        return serviceInstance;
-                    })
-                    .collect(Collectors.toList());
+            Instance[] instances = operator.getAvailableInstances(serviceName, true);
+            if (Objects.isNull(instances) || instances.length == 0) {
+                return;
+            }
+            List<ServiceInstance> serviceInstances = new ArrayList<>(instances.length);
+            for (Instance instance : instances) {
+                DefaultServiceInstance serviceInstance =
+                        new DefaultServiceInstance(
+                                instance.getService(),
+                                instance.getHost(), instance.getPort(),
+                                ScopeModelUtil.getApplicationModel(registryURL.getScopeModel()));
+                serviceInstance.setMetadata(instance.getMetadata());
+                serviceInstance.setEnabled(!instance.isIsolated());
+                serviceInstance.setHealthy(instance.isHealthy());
+                serviceInstances.add(serviceInstance);
+            }
 
             Set<ServiceInstancesChangedListener> listeners = serviceListeners.getOrDefault(service, Collections.emptySet());