Fix testCreateAndRestorePartialSearchableSnapshot (#71796)

Parts of the test will fail without any frozen cache since shards then cannot allocate (or move), changed tests to always have a minimal frozen cache. Closes #71665
elastic · Apr 19, 2021 · 439f5c4 · 439f5c4
1 parent ceb191a
commit 439f5c4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/...ava/org/elasticsearch/xpack/searchablesnapshots/BaseSearchableSnapshotsIntegTestCase.java b/...ava/org/elasticsearch/xpack/searchablesnapshots/BaseSearchableSnapshotsIntegTestCase.java
@@ -87,8 +87,8 @@ protected Settings nodeSettings(int nodeOrdinal) {
             FrozenCacheService.SNAPSHOT_CACHE_SIZE_SETTING.getKey(),
             rarely()
                 ? randomBoolean()
-                    ? new ByteSizeValue(randomIntBetween(0, 10), ByteSizeUnit.KB)
-                    : new ByteSizeValue(randomIntBetween(0, 1000), ByteSizeUnit.BYTES)
+                    ? new ByteSizeValue(randomIntBetween(1, 10), ByteSizeUnit.KB)
+                    : new ByteSizeValue(randomIntBetween(1, 1000), ByteSizeUnit.BYTES)
                 : new ByteSizeValue(randomIntBetween(1, 10), ByteSizeUnit.MB)
         );
         builder.put(

diff --git a/...rTest/java/org/elasticsearch/xpack/searchablesnapshots/SearchableSnapshotsIntegTests.java b/...rTest/java/org/elasticsearch/xpack/searchablesnapshots/SearchableSnapshotsIntegTests.java
@@ -404,7 +404,6 @@ public void testCreateAndRestoreSearchableSnapshot() throws Exception {
         assertTotalHits(aliasName, originalAllHits, originalBarHits);
     }
 
-    @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/71665")
     public void testCreateAndRestorePartialSearchableSnapshot() throws Exception {
         final String fsRepoName = randomAlphaOfLength(10);
         final String indexName = randomAlphaOfLength(10).toLowerCase(Locale.ROOT);