Skip to content

Use assertBusy for waiting on file settings watching in readiness test #136131

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 8, 2025
+3 −4
Merged

Use assertBusy for waiting on file settings watching in readiness test #136131

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3831a56
Use assertBusy for waiting on file settings watching in readiness test
rjernst Oct 7, 2025
965a26f
[CI] Auto commit changes from spotless
Oct 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions server/src/internalClusterTest/java/org/elasticsearch/readiness/ReadinessClusterIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,6 @@ protected Collection<Class<? extends Plugin>> getMockPlugins() {
return Collections.unmodifiableList(plugins);
}

@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/108613")
public void testReadinessDuringRestarts() throws Exception {
internalCluster().setBootstrapMasterNodeIndex(0);
writeFileSettings(testJSON);
Expand Down Expand Up @@ -258,7 +257,7 @@ public void testNotReadyOnBadFileSettings() throws Exception {

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

assertTrue(masterFileSettingsService.watching());
assertBusy(() -> assertTrue(masterFileSettingsService.watching()));
assertFalse(dataFileSettingsService.watching());

boolean awaitSuccessful = savedClusterState.await(20, TimeUnit.SECONDS);
Expand Down Expand Up @@ -315,7 +314,7 @@ public void testReadyWhenMissingFileSettings() throws Exception {

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

assertTrue(masterFileSettingsService.watching());
assertBusy(() -> assertTrue(masterFileSettingsService.watching()));

boolean awaitSuccessful = savedClusterState.v1().await(20, TimeUnit.SECONDS);
assertTrue(awaitSuccessful);
Expand Down Expand Up @@ -369,7 +368,7 @@ public void testReadyAfterCorrectFileSettings() throws Exception {

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

assertTrue(masterFileSettingsService.watching());
assertBusy(() -> assertTrue(masterFileSettingsService.watching()));
assertFalse(dataFileSettingsService.watching());

boolean awaitSuccessful = savedClusterState.v1().await(20, TimeUnit.SECONDS);
Expand Down