limit iterations

tlrx · tlrx · commit 437c8ea0c64f · 2020-11-17T13:21:12.000+01:00
diff --git a/x-pack/plugin/searchable-snapshots/src/main/java/org/elasticsearch/xpack/searchablesnapshots/cache/CacheService.java b/x-pack/plugin/searchable-snapshots/src/main/java/org/elasticsearch/xpack/searchablesnapshots/cache/CacheService.java
@@ -246,7 +246,7 @@ protected void synchronizeCache() {
         long count = 0L;
         final Set<Path> cacheDirs = new HashSet<>();
         final long startTimeNanos = threadPool.relativeTimeInNanos();
-        final int maxCacheFilesToSync = this.maxCacheFilesToSyncAtOnce;
+        final int maxCacheFilesToSync = Math.min(cacheFilesToSync.size(), this.maxCacheFilesToSyncAtOnce);
         for (long i = 0L; i < maxCacheFilesToSync; i++) {
             if (lifecycleState() != Lifecycle.State.STARTED) {
                 logger.debug("stopping cache synchronization (cache service is closing)");
