Home Explore Help
Sign In
lqb
/
elasticsearch
mirror of https://gitee.com/mirrors/elasticsearch.git
1
0
Fork 0
Files Issues 0 Wiki
Browse Source

Guard checking master node watching for file settings (#124960)

Ryan Ernst 7 months ago
parent
665e89065f
commit
e39f14d697
1 changed files with 4 additions and 4 deletions
Split View Show Diff Stats
  1. 4 4
      server/src/internalClusterTest/java/org/elasticsearch/reservedstate/service/FileSettingsServiceIT.java

+ 4 - 4
server/src/internalClusterTest/java/org/elasticsearch/reservedstate/service/FileSettingsServiceIT.java
View File 

@@ -253,7 +253,7 @@ public class FileSettingsServiceIT extends ESIntegTestCase {
 
 
         FileSettingsService masterFileSettingsService = internalCluster().getInstance(FileSettingsService.class, masterNode);
 
 
-        assertTrue(masterFileSettingsService.watching());
 
+        assertBusy(() -> assertTrue(masterFileSettingsService.watching()));
 
         assertFalse(dataFileSettingsService.watching());
 
 
         writeJSONFile(masterNode, testJSON, logger, versionCounter.incrementAndGet());
 
@@ -279,7 +279,7 @@ public class FileSettingsServiceIT extends ESIntegTestCase {
 
 
         FileSettingsService masterFileSettingsService = internalCluster().getInstance(FileSettingsService.class, masterNode);
 
 
-        assertTrue(masterFileSettingsService.watching());
 
+        assertBusy(() -> assertTrue(masterFileSettingsService.watching()));
 
         assertFalse(dataFileSettingsService.watching());
 
 
         assertClusterStateSaveOK(savedClusterState.v1(), savedClusterState.v2(), "50mb");
 
@@ -374,7 +374,7 @@ public class FileSettingsServiceIT extends ESIntegTestCase {
 
 
         FileSettingsService masterFileSettingsService = internalCluster().getInstance(FileSettingsService.class, masterNode);
 
 
-        assertTrue(masterFileSettingsService.watching());
 
+        assertBusy(() -> assertTrue(masterFileSettingsService.watching()));
 
         assertFalse(dataFileSettingsService.watching());
 
 
         writeJSONFile(masterNode, testErrorJSON, logger, versionCounter.incrementAndGet());
 
@@ -470,7 +470,7 @@ public class FileSettingsServiceIT extends ESIntegTestCase {
 
         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");