Skip to content

[9.0] Guard checking master node watching for file settings (#124960) #125015

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 1 commit into from
Mar 17, 2025
Merged

[9.0] Guard checking master node watching for file settings (#124960) #125015

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions ...ternalClusterTest/java/org/elasticsearch/reservedstate/service/FileSettingsServiceIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ public void testSettingsApplied() throws Exception {

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

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

writeJSONFile(masterNode, testJSON, logger, versionCounter.incrementAndGet());
Expand All @@ -279,7 +279,7 @@ public void testSettingsAppliedOnStart() throws Exception {

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

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

assertClusterStateSaveOK(savedClusterState.v1(), savedClusterState.v2(), "50mb");
Expand Down Expand Up @@ -374,7 +374,7 @@ public void testErrorSaved() throws Exception {

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

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

writeJSONFile(masterNode, testErrorJSON, logger, versionCounter.incrementAndGet());
Expand Down Expand Up @@ -470,7 +470,7 @@ public void testSettingsAppliedOnMasterReElection() throws Exception {
var savedClusterState = setupClusterStateListener(masterNode);
FileSettingsService masterFileSettingsService = internalCluster().getInstance(FileSettingsService.class, masterNode);

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

writeJSONFile(masterNode, testJSON, logger, versionCounter.incrementAndGet());
assertClusterStateSaveOK(savedClusterState.v1(), savedClusterState.v2(), "50mb");
Expand Down