Test status from local current info

Author: prdoyle

server/src/main/java/org/elasticsearch/reservedstate/service/FileSettingsService.java

@@ -389,7 +389,14 @@ public String name() {
 
         @Override
         public synchronized HealthIndicatorResult calculate(boolean verbose, int maxAffectedResourcesCount, HealthInfo healthInfo) {
-            FileSettingsHealthInfo info = healthInfo.fileSettingsHealthInfo();
+            return calculate(healthInfo.fileSettingsHealthInfo());
+        }
+
+        public HealthIndicatorResult calculateFromCurrentInfo() {
+            return calculate(currentInfo);
+        }
+
+        private HealthIndicatorResult calculate(FileSettingsHealthInfo info) {
             if (info.isActive() == false) {
                 return createIndicator(GREEN, INACTIVE_SYMPTOM, HealthIndicatorDetails.EMPTY, List.of(), List.of());
             }

server/src/test/java/org/elasticsearch/reservedstate/service/FileSettingsHealthIndicatorServiceTests.java

@@ -48,17 +48,17 @@ public void testInitiallyGreen() {}
     public void testStartAndStop() {
         assertEquals(
             new HealthIndicatorResult("file_settings", GREEN, INACTIVE_SYMPTOM, HealthIndicatorDetails.EMPTY, List.of(), List.of()),
-            healthIndicatorService.calculate(false, null)
+            healthIndicatorService.calculateFromCurrentInfo()
         );
         healthIndicatorService.startOccurred();
         assertEquals(
             new HealthIndicatorResult("file_settings", GREEN, NO_CHANGES_SYMPTOM, HealthIndicatorDetails.EMPTY, List.of(), List.of()),
-            healthIndicatorService.calculate(false, null)
+            healthIndicatorService.calculateFromCurrentInfo()
         );
         healthIndicatorService.stopOccurred();
         assertEquals(
             new HealthIndicatorResult("file_settings", GREEN, INACTIVE_SYMPTOM, HealthIndicatorDetails.EMPTY, List.of(), List.of()),
-            healthIndicatorService.calculate(false, null)
+            healthIndicatorService.calculateFromCurrentInfo()
         );
     }
 
@@ -69,7 +69,7 @@ public void testGreenYellowYellowGreen() {
         // While the change is still in progress, we don't change the status.
         assertEquals(
             new HealthIndicatorResult("file_settings", GREEN, SUCCESS_SYMPTOM, HealthIndicatorDetails.EMPTY, List.of(), List.of()),
-            healthIndicatorService.calculate(false, null)
+            healthIndicatorService.calculateFromCurrentInfo()
         );
 
         healthIndicatorService.failureOccurred("whoopsie 1");
@@ -82,7 +82,7 @@ public void testGreenYellowYellowGreen() {
                 STALE_SETTINGS_IMPACT,
                 List.of()
             ),
-            healthIndicatorService.calculate(false, null)
+            healthIndicatorService.calculateFromCurrentInfo()
         );
 
         healthIndicatorService.failureOccurred("whoopsie #2");
@@ -95,13 +95,13 @@ public void testGreenYellowYellowGreen() {
                 STALE_SETTINGS_IMPACT,
                 List.of()
             ),
-            healthIndicatorService.calculate(false, null)
+            healthIndicatorService.calculateFromCurrentInfo()
         );
 
         healthIndicatorService.successOccurred();
         assertEquals(
             new HealthIndicatorResult("file_settings", GREEN, SUCCESS_SYMPTOM, HealthIndicatorDetails.EMPTY, List.of(), List.of()),
-            healthIndicatorService.calculate(false, null)
+            healthIndicatorService.calculateFromCurrentInfo()
         );
     }
 
@@ -128,7 +128,7 @@ private void checkTruncatedDescription(int lengthLimit, String description, Stri
                 STALE_SETTINGS_IMPACT,
                 List.of()
             ),
-            service.calculate(false, null)
+            service.calculateFromCurrentInfo()
         );
     }
 }

server/src/test/java/org/elasticsearch/reservedstate/service/FileSettingsServiceTests.java

@@ -233,7 +233,7 @@ public void testInitialFileError() throws Exception {
         verify(fileSettingsService, times(1)).processFile(eq(watchedFile), eq(true));
         verify(controller, times(1)).process(any(), any(XContentParser.class), eq(ReservedStateVersionCheck.HIGHER_OR_SAME_VERSION), any());
 
-        assertEquals(YELLOW, healthIndicatorService.calculate(false, null).status());
+        assertEquals(YELLOW, healthIndicatorService.calculateFromCurrentInfo().status());
         verify(healthIndicatorService, times(1)).changeOccurred();
         verify(healthIndicatorService, times(1)).failureOccurred(argThat(s -> s.startsWith(IllegalStateException.class.getName())));
     }
@@ -268,7 +268,7 @@ public void testInitialFileWorks() throws Exception {
         verify(fileSettingsService, times(1)).processFile(eq(watchedFile), eq(true));
         verify(controller, times(1)).process(any(), any(XContentParser.class), eq(ReservedStateVersionCheck.HIGHER_OR_SAME_VERSION), any());
 
-        assertEquals(GREEN, healthIndicatorService.calculate(false, null).status());
+        assertEquals(GREEN, healthIndicatorService.calculateFromCurrentInfo().status());
         verify(healthIndicatorService, times(1)).changeOccurred();
         verify(healthIndicatorService, times(1)).successOccurred();
     }
@@ -323,7 +323,7 @@ public void testProcessFileChanges() throws Exception {
         verify(fileSettingsService, times(1)).processFile(eq(watchedFile), eq(false));
         verify(controller, times(1)).process(any(), any(XContentParser.class), eq(ReservedStateVersionCheck.HIGHER_VERSION_ONLY), any());
 
-        assertEquals(GREEN, healthIndicatorService.calculate(false, null).status());
+        assertEquals(GREEN, healthIndicatorService.calculateFromCurrentInfo().status());
         verify(healthIndicatorService, times(2)).changeOccurred();
         verify(healthIndicatorService, times(2)).successOccurred();
     }
@@ -367,7 +367,7 @@ public void testInvalidJSON() throws Exception {
             argThat(e -> unwrapException(e) instanceof XContentParseException)
         );
 
-        assertEquals(YELLOW, healthIndicatorService.calculate(false, null).status());
+        assertEquals(YELLOW, healthIndicatorService.calculateFromCurrentInfo().status());
         verify(healthIndicatorService, Mockito.atLeast(1)).failureOccurred(contains(XContentParseException.class.getName()));
     }
 
@@ -434,7 +434,7 @@ public void testStopWorksInMiddleOfProcessing() throws Exception {
         fileSettingsService.close();
 
         // When the service is stopped, the health indicator should be green
-        assertEquals(GREEN, healthIndicatorService.calculate(false, null).status());
+        assertEquals(GREEN, healthIndicatorService.calculateFromCurrentInfo().status());
         verify(healthIndicatorService).stopOccurred();
 
         // let the deadlocked thread end, so we can cleanly exit the test