bugfix: the issue of possible infinite loop when cleaning up expired …

…metadata info
apache · Jan 22, 2025 · 0fa7cbe · 0fa7cbe
1 parent f5fc3fe
commit 0fa7cbe
Showing 1 changed file with 11 additions and 10 deletions.
diff --git a/...registry-api/src/main/java/org/apache/dubbo/registry/client/AbstractServiceDiscovery.java b/...registry-api/src/main/java/org/apache/dubbo/registry/client/AbstractServiceDiscovery.java
@@ -130,27 +130,28 @@ private AbstractServiceDiscovery(ApplicationModel applicationModel, String servi
     }
 
     public void removeExpiredMetadataInfo(int metadataInfoCacheSize, int metadataInfoCacheExpireTime) {
+        Long time = null;
         if (metadataInfos.size() > metadataInfoCacheSize) {
             List<MetadataInfoStat> values = new ArrayList<>(metadataInfos.values());
             values.sort(Comparator.comparingLong(MetadataInfoStat::getUpdateTime));
             for (MetadataInfoStat v : values) {
-                long time = System.currentTimeMillis() - v.getUpdateTime();
+                time = System.currentTimeMillis() - v.getUpdateTime();
                 if (time > metadataInfoCacheExpireTime) {
                     metadataInfos.remove(v.metadataInfo.getRevision(), v);
                 } else {
-                    this.refreshCacheFuture = applicationModel
-                            .getFrameworkModel()
-                            .getBeanFactory()
-                            .getBean(FrameworkExecutorRepository.class)
-                            .getSharedScheduledExecutor()
-                            .schedule(
-                                    () -> removeExpiredMetadataInfo(metadataInfoCacheSize, metadataInfoCacheExpireTime),
-                                    time,
-                                    TimeUnit.MILLISECONDS);
                     break;
                 }
             }
         }
+        this.refreshCacheFuture = applicationModel
+                .getFrameworkModel()
+                .getBeanFactory()
+                .getBean(FrameworkExecutorRepository.class)
+                .getSharedScheduledExecutor()
+                .schedule(
+                        () -> removeExpiredMetadataInfo(metadataInfoCacheSize, metadataInfoCacheExpireTime),
+                        time == null ? metadataInfoCacheExpireTime / 2 : time,
+                        TimeUnit.MILLISECONDS);
     }
 
     @Override