From 1dc9494859534e7a78d77a95ba00c7d10bf90866 Mon Sep 17 00:00:00 2001 From: Nhat Nguyen Date: Tue, 11 Feb 2020 16:43:19 -0500 Subject: [PATCH 1/2] Exclude MockRandomMergePolicy in testShouldPeriodicallyFlushAfterMerge --- .../org/elasticsearch/index/engine/InternalEngineTests.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/server/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java b/server/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java index c94b4967cb7cf..28a8df95b7d99 100644 --- a/server/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java +++ b/server/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java @@ -4753,6 +4753,8 @@ public void testShouldPeriodicallyFlush() throws Exception { } public void testShouldPeriodicallyFlushAfterMerge() throws Exception { + engine.close(); + engine = createEngine(copy(engine.config(), newMergePolicy(random(), false))); assertThat("Empty engine does not need flushing", engine.shouldPeriodicallyFlush(), equalTo(false)); ParsedDocument doc = testParsedDocument(Integer.toString(0), null, testDocumentWithTextField(), SOURCE, null); From f11940d9af192835e12ab4c83196896334854438 Mon Sep 17 00:00:00 2001 From: Nhat Nguyen Date: Tue, 11 Feb 2020 17:27:49 -0500 Subject: [PATCH 2/2] comment --- .../java/org/elasticsearch/index/engine/InternalEngineTests.java | 1 + 1 file changed, 1 insertion(+) diff --git a/server/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java b/server/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java index 28a8df95b7d99..f0749df406daf 100644 --- a/server/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java +++ b/server/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java @@ -4754,6 +4754,7 @@ public void testShouldPeriodicallyFlush() throws Exception { public void testShouldPeriodicallyFlushAfterMerge() throws Exception { engine.close(); + // Do not use MockRandomMergePolicy as it can cause a force merge performing two merges. engine = createEngine(copy(engine.config(), newMergePolicy(random(), false))); assertThat("Empty engine does not need flushing", engine.shouldPeriodicallyFlush(), equalTo(false)); ParsedDocument doc =