Fix flaky behavior of RemoteStoreRestoreIT.testRateLimitedRemoteDownl…

…oads (opensearch-project#9887) (opensearch-project#10068) * Fix flaky behavior of RemoteStoreRestoreIT.testRateLimitedRemoteDownloads (cherry picked from commit 74fcaab) Signed-off-by: Sachin Kale <[email protected]> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
gashutos · Sep 16, 2023 · 9d3ee61 · 9d3ee61
1 parent 43f6717
commit 9d3ee61
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/...src/internalClusterTest/java/org/opensearch/remotestore/RemoteStoreBaseIntegTestCase.java b/...src/internalClusterTest/java/org/opensearch/remotestore/RemoteStoreBaseIntegTestCase.java
@@ -230,7 +230,7 @@ public static Settings buildRemoteStoreNodeAttributes(
 
         if (withRateLimiterAttributes) {
             settings.put(segmentRepoSettingsAttributeKeyPrefix + "compress", randomBoolean())
-                .put(segmentRepoSettingsAttributeKeyPrefix + "max_remote_download_bytes_per_sec", "2kb")
+                .put(segmentRepoSettingsAttributeKeyPrefix + "max_remote_download_bytes_per_sec", "4kb")
                 .put(segmentRepoSettingsAttributeKeyPrefix + "chunk_size", 200, ByteSizeUnit.BYTES);
         }
 

diff --git a/server/src/internalClusterTest/java/org/opensearch/remotestore/RemoteStoreRestoreIT.java b/server/src/internalClusterTest/java/org/opensearch/remotestore/RemoteStoreRestoreIT.java
@@ -406,9 +406,10 @@ public void testRateLimitedRemoteDownloads() throws Exception {
             for (RepositoriesService repositoriesService : internalCluster().getDataNodeInstances(RepositoriesService.class)) {
                 downloadPauseTime += repositoriesService.repository(REPOSITORY_NAME).getRemoteDownloadThrottleTimeInNanos();
             }
-            assertThat(downloadPauseTime, greaterThan(TimeValue.timeValueSeconds(randomIntBetween(5, 10)).nanos()));
+            assertThat(downloadPauseTime, greaterThan(TimeValue.timeValueSeconds(randomIntBetween(3, 5)).nanos()));
         }, 30, TimeUnit.SECONDS);
-        ensureGreen(INDEX_NAME);
+        // Waiting for extended period for green state so that rate limit does not cause flakiness
+        ensureGreen(TimeValue.timeValueSeconds(120), INDEX_NAME);
         // This is required to get updated number from already active shards which were not restored
         assertEquals(shardCount, getNumShards(INDEX_NAME).totalNumShards);
         assertEquals(0, getNumShards(INDEX_NAME).numReplicas);