Also on removeFromCache

Author: tlrx

x-pack/plugin/searchable-snapshots/src/main/java/org/elasticsearch/xpack/searchablesnapshots/cache/CacheService.java

@@ -99,12 +99,14 @@ public CacheFile get(final String name, final long length, final Path file) thro
      * @param predicate the predicate to evaluate
      */
     public void removeFromCache(final Predicate<String> predicate) {
-        for (String cacheKey : cache.keys()) {
-            if (predicate.test(cacheKey)) {
-                cache.invalidate(cacheKey);
+        try (ReleasableLock ignored = cacheInvalidationLock.acquire()) {
+            for (String cacheKey : cache.keys()) {
+                if (predicate.test(cacheKey)) {
+                    cache.invalidate(cacheKey);
+                }
             }
+            cache.refresh();
         }
-        cache.refresh();
     }
 
     /**