From 7b13c245c59c55cb526222cfb45c84ea0d058355 Mon Sep 17 00:00:00 2001
From: "opensearch-trigger-bot[bot]"
 <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Date: Wed, 15 Jun 2022 16:00:48 -0400
Subject: [PATCH] Fixing flakiness of ShuffleForcedMergePolicyTests (#3591)
 (#3592)

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
(cherry picked from commit 055a9fc44bfc151799c1ad1cdd364fdde9e0c8b6)

Co-authored-by: Andriy Redko <andriy.redko@aiven.io>
---
 .../opensearch/lucene/index/ShuffleForcedMergePolicyTests.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/src/test/java/org/opensearch/lucene/index/ShuffleForcedMergePolicyTests.java b/server/src/test/java/org/opensearch/lucene/index/ShuffleForcedMergePolicyTests.java
index e583c12473a30..8842b7db5c6b4 100644
--- a/server/src/test/java/org/opensearch/lucene/index/ShuffleForcedMergePolicyTests.java
+++ b/server/src/test/java/org/opensearch/lucene/index/ShuffleForcedMergePolicyTests.java
@@ -58,7 +58,7 @@
 public class ShuffleForcedMergePolicyTests extends BaseMergePolicyTestCase {
     public void testDiagnostics() throws IOException {
         try (Directory dir = newDirectory()) {
-            IndexWriterConfig iwc = newIndexWriterConfig();
+            IndexWriterConfig iwc = newIndexWriterConfig().setMaxFullFlushMergeWaitMillis(0);
             MergePolicy mp = new ShuffleForcedMergePolicy(newTieredMergePolicy());
             iwc.setMergePolicy(mp);
             boolean sorted = random().nextBoolean();