Skip to content

Commit 8cac490

Browse files
authored
Fix log expectation inconsistency in flush test (#89571)
Fixes #89518
1 parent bdbfcb3 commit 8cac490

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

server/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3924,10 +3924,7 @@ protected void commitIndexWriter(final IndexWriter writer, final Translog transl
39243924
Loggers.addAppender(LogManager.getLogger(Engine.class), mockLogAppender);
39253925

39263926
// Issue the first flushOnIdle request. The flush happens in the background using the flush threadpool.
3927-
shard.flushOnIdle(0);
3928-
assertFalse(shard.isActive());
3929-
3930-
// Wait for log message that flush acquired lock immediately
3927+
// Then wait for log message that flush acquired lock immediately
39313928
mockLogAppender.addExpectation(
39323929
new MockLogAppender.SeenEventExpectation(
39333930
"should see first flush getting lock immediately",
@@ -3936,6 +3933,8 @@ protected void commitIndexWriter(final IndexWriter writer, final Translog transl
39363933
"acquired flush lock immediately"
39373934
)
39383935
);
3936+
shard.flushOnIdle(0);
3937+
assertFalse(shard.isActive());
39393938
assertBusy(mockLogAppender::assertAllExpectationsMatched);
39403939

39413940
// While the first flush is happening, index one more doc (to turn the shard's active flag to true),

0 commit comments

Comments
 (0)