Merge pull request #1511 from kilink/avoid-instances-set-copy-2

Call size method on Application to avoid copying instance info
Netflix · Aug 18, 2023 · 0b32fa1 · 0b32fa1
2 parents 40a91d5 + 418f1b1
commit 0b32fa1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/eureka-client/src/main/java/com/netflix/discovery/DiscoveryClient.java b/eureka-client/src/main/java/com/netflix/discovery/DiscoveryClient.java
@@ -1115,7 +1115,7 @@ private void logTotalInstances() {
         if (logger.isDebugEnabled()) {
             int totInstances = 0;
             for (Application application : getApplications().getRegisteredApplications()) {
-                totInstances += application.getInstancesAsIsFromEureka().size();
+                totInstances += application.size();
             }
             logger.debug("The total number of all instances in the client now is {}", totInstances);
         }
@@ -1219,7 +1219,7 @@ private void updateDelta(Applications delta) {
                          * We find all instance list from application(The status of instance status is not only the status is UP but also other status)
                          * if instance list is empty, we remove the application.
                          */
-                        if (existingApp.getInstancesAsIsFromEureka().isEmpty()) {
+                        if (existingApp.size() == 0) {
                             applications.removeApplication(existingApp);
                         }
                     }

diff --git a/eureka-client/src/main/java/com/netflix/discovery/shared/Application.java b/eureka-client/src/main/java/com/netflix/discovery/shared/Application.java
@@ -187,7 +187,9 @@ public void setName(String name) {
      * @return the number of instances in this application
      */
     public int size() {
-        return instances.size();
+        synchronized (instances) {
+            return instances.size();
+        }
     }
 
     /**
@@ -252,6 +254,7 @@ private void _shuffleAndStoreInstances(boolean filterUpInstances, boolean indexB
         this.shuffledInstances.set(instanceInfoList);
     }
 
+
     private void removeInstance(InstanceInfo i, boolean markAsDirty) {
         instancesMap.remove(i.getId());
         synchronized (instances) {