Skip to content

Commit a2bef60

Browse files
[CI] FileSettingsServiceIT testErrorCanRecoverOnRestart failing (elastic#116895) (elastic#117511) (elastic#117558)
Fixes flaky test FileSettingsServiceIT.testErrorCanRecoverOnRestart Fixes elastic#116895
1 parent b77faac commit a2bef60

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

server/src/internalClusterTest/java/org/elasticsearch/reservedstate/service/FileSettingsServiceIT.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@ public void testErrorCanRecoverOnRestart() throws Exception {
398398

399399
FileSettingsService masterFileSettingsService = internalCluster().getInstance(FileSettingsService.class, masterNode);
400400

401-
assertTrue(masterFileSettingsService.watching());
401+
assertBusy(() -> assertTrue(masterFileSettingsService.watching()));
402402
assertFalse(dataFileSettingsService.watching());
403403

404404
writeJSONFile(masterNode, testErrorJSON, logger, versionCounter.incrementAndGet());
@@ -434,7 +434,7 @@ public void testNewErrorOnRestartReprocessing() throws Exception {
434434

435435
FileSettingsService masterFileSettingsService = internalCluster().getInstance(FileSettingsService.class, masterNode);
436436

437-
assertTrue(masterFileSettingsService.watching());
437+
assertBusy(() -> assertTrue(masterFileSettingsService.watching()));
438438
assertFalse(dataFileSettingsService.watching());
439439

440440
writeJSONFile(masterNode, testErrorJSON, logger, versionCounter.incrementAndGet());

0 commit comments

Comments
 (0)