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

…metadata info
apache · Jan 22, 2025 · 7d09195 · 7d09195
1 parent beb6b95
commit 7d09195
Showing 1 changed file with 6 additions and 6 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
@@ -114,35 +114,35 @@ private AbstractServiceDiscovery(ApplicationModel applicationModel, String servi
     }
 
     private void removeExpiredMetadataInfo(int metadataInfoCacheSize, int metadataInfoCacheExpireTime) {
-        Long time = null;
+        Long nextTime = null;
         if (metadataInfos.size() > metadataInfoCacheSize) {
             List<MetadataInfoStat> values = new ArrayList<>(metadataInfos.values());
             values.sort(Comparator.comparingLong(MetadataInfoStat::getUpdateTime));
             for (MetadataInfoStat v : values) {
-                time = System.currentTimeMillis() - v.getUpdateTime();
+                long time = System.currentTimeMillis() - v.getUpdateTime();
                 if (time > metadataInfoCacheExpireTime) {
                     metadataInfos.remove(v.metadataInfo.getRevision(), v);
-                    time = null;
                 } else {
+                    nextTime = metadataInfoCacheExpireTime - time;
                     break;
                 }
             }
         }
         startRefreshCache(
-                time == null ? metadataInfoCacheExpireTime / 2 : time,
+                nextTime == null ? metadataInfoCacheExpireTime / 2 : nextTime,
                 metadataInfoCacheSize,
                 metadataInfoCacheExpireTime);
     }
 
-    private void startRefreshCache(long time, int metadataInfoCacheSize, int metadataInfoCacheExpireTime) {
+    private void startRefreshCache(long nextTime, int metadataInfoCacheSize, int metadataInfoCacheExpireTime) {
         this.refreshCacheFuture = applicationModel
                 .getFrameworkModel()
                 .getBeanFactory()
                 .getBean(FrameworkExecutorRepository.class)
                 .getSharedScheduledExecutor()
                 .schedule(
                         () -> removeExpiredMetadataInfo(metadataInfoCacheSize, metadataInfoCacheExpireTime),
-                        time,
+                        nextTime,
                         TimeUnit.MILLISECONDS);
     }