Enable prewarming by default for searchable snapshots (elastic#56201)

Now searchable snapshots directories respect the repository rate limitations (elastic#55952) we can enable prewarming by default for shards.
bhagya7977 · May 6, 2020 · 6540efd · 6540efd
1 parent 6a69ab4
commit 6540efd
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/...pshots/src/main/java/org/elasticsearch/xpack/searchablesnapshots/SearchableSnapshots.java b/...pshots/src/main/java/org/elasticsearch/xpack/searchablesnapshots/SearchableSnapshots.java
@@ -105,7 +105,7 @@ public class SearchableSnapshots extends Plugin implements IndexStorePlugin, Eng
     );
     public static final Setting<Boolean> SNAPSHOT_CACHE_PREWARM_ENABLED_SETTING = Setting.boolSetting(
         "index.store.snapshot.cache.prewarm.enabled",
-        false,
+        true,
         Setting.Property.IndexScope
     );
     // The file extensions that are excluded from the cache

diff --git a/...ts/src/test/java/org/elasticsearch/index/store/SearchableSnapshotDirectoryStatsTests.java b/...ts/src/test/java/org/elasticsearch/index/store/SearchableSnapshotDirectoryStatsTests.java
@@ -36,6 +36,7 @@
 import static org.elasticsearch.index.store.cache.TestUtils.createCacheService;
 import static org.elasticsearch.index.store.cache.TestUtils.singleBlobContainer;
 import static org.elasticsearch.xpack.searchablesnapshots.SearchableSnapshots.SNAPSHOT_CACHE_ENABLED_SETTING;
+import static org.elasticsearch.xpack.searchablesnapshots.SearchableSnapshots.SNAPSHOT_CACHE_PREWARM_ENABLED_SETTING;
 import static org.elasticsearch.xpack.searchablesnapshots.SearchableSnapshots.SNAPSHOT_UNCACHED_CHUNK_SIZE_SETTING;
 import static org.hamcrest.Matchers.allOf;
 import static org.hamcrest.Matchers.equalTo;
@@ -519,7 +520,10 @@ public void testBackwardSeeks() {
     private static void executeTestCase(final TriConsumer<String, byte[], SearchableSnapshotDirectory> test) {
         executeTestCase(
             createCacheService(random()),
-            Settings.builder().put(SNAPSHOT_CACHE_ENABLED_SETTING.getKey(), randomBoolean()).build(),
+            Settings.builder()
+                .put(SNAPSHOT_CACHE_ENABLED_SETTING.getKey(), randomBoolean())
+                .put(SNAPSHOT_CACHE_PREWARM_ENABLED_SETTING.getKey(), false) // disable prewarming as it impacts the stats
+                .build(),
             test
         );
     }
@@ -553,7 +557,10 @@ private static void executeTestCaseWithCache(
     ) {
         executeTestCase(
             new CacheService(cacheSize, cacheRangeSize),
-            Settings.builder().put(SNAPSHOT_CACHE_ENABLED_SETTING.getKey(), true).build(),
+            Settings.builder()
+                .put(SNAPSHOT_CACHE_ENABLED_SETTING.getKey(), true)
+                .put(SNAPSHOT_CACHE_PREWARM_ENABLED_SETTING.getKey(), false) // disable prewarming as it impacts the stats
+                .build(),
             test
         );
     }

diff --git a/...src/test/java/org/elasticsearch/index/store/cache/CachedBlobContainerIndexInputTests.java b/...src/test/java/org/elasticsearch/index/store/cache/CachedBlobContainerIndexInputTests.java
@@ -157,7 +157,7 @@ public void testThrowsEOFException() throws IOException {
             );
 
             final BlobContainer blobContainer = singleBlobContainer(blobName, input);
-
+            final ThreadPool threadPool = new TestThreadPool(getTestName(), SearchableSnapshots.executorBuilder());
             final Path cacheDir = createTempDir();
             try (
                 SearchableSnapshotDirectory searchableSnapshotDirectory = new SearchableSnapshotDirectory(
@@ -170,7 +170,7 @@ public void testThrowsEOFException() throws IOException {
                     () -> 0L,
                     cacheService,
                     cacheDir,
-                    null
+                    threadPool
                 )
             ) {
                 final boolean loaded = searchableSnapshotDirectory.loadSnapshot();
@@ -185,6 +185,8 @@ public void testThrowsEOFException() throws IOException {
                         throw new AssertionError("inner EOFException not thrown", exception);
                     }
                 }
+            } finally {
+                terminate(threadPool);
             }
         }
     }