From ffa1420e15bcf51a0cdeb223ffc6dc997225aefd Mon Sep 17 00:00:00 2001 From: Iraklis Psaroudakis Date: Wed, 24 Aug 2022 12:26:39 +0300 Subject: [PATCH] Fix log expectation inconsistency in flush test Fixes #89518 --- .../org/elasticsearch/index/shard/IndexShardTests.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/server/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java b/server/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java index 1ce2685952d25..ad07c073ed9b1 100644 --- a/server/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java +++ b/server/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java @@ -3924,10 +3924,7 @@ protected void commitIndexWriter(final IndexWriter writer, final Translog transl Loggers.addAppender(LogManager.getLogger(Engine.class), mockLogAppender); // Issue the first flushOnIdle request. The flush happens in the background using the flush threadpool. - shard.flushOnIdle(0); - assertFalse(shard.isActive()); - - // Wait for log message that flush acquired lock immediately + // Then wait for log message that flush acquired lock immediately mockLogAppender.addExpectation( new MockLogAppender.SeenEventExpectation( "should see first flush getting lock immediately", @@ -3936,6 +3933,8 @@ protected void commitIndexWriter(final IndexWriter writer, final Translog transl "acquired flush lock immediately" ) ); + shard.flushOnIdle(0); + assertFalse(shard.isActive()); assertBusy(mockLogAppender::assertAllExpectationsMatched); // While the first flush is happening, index one more doc (to turn the shard's active flag to true),