SONAR-9741 don't check ES status when computing node health status

2 files changed, 21 insertions, 5 deletions

diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/HealthActionModule.java b/server/sonar-server/src/main/java/org/sonar/server/platform/ws/HealthActionModule.java
index 05cf290cedc..2b8a0d4708c 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/HealthActionModule.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/platform/ws/HealthActionModule.java
@@ -42,9 +42,10 @@ public class HealthActionModule extends Module {
     // NodeHealthCheck implementations
     add(WebServerStatusNodeCheck.class,
       DbConnectionNodeCheck.class,
-      EsStatusNodeCheck.class,
       CeStatusNodeCheck.class);
-    if (!webServer.isStandalone()) {
+    if (webServer.isStandalone()) {
+      add(EsStatusNodeCheck.class);
+    } else {
       // ClusterHealthCheck implementations
       add(EsStatusClusterCheck.class,
         AppNodeClusterCheck.class,
diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/ws/HealthActionModuleTest.java b/server/sonar-server/src/test/java/org/sonar/server/platform/ws/HealthActionModuleTest.java
index 07d1a027699..1f9e1479c41 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/platform/ws/HealthActionModuleTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/platform/ws/HealthActionModuleTest.java
@@ -63,9 +63,8 @@ public class HealthActionModuleTest {
   }
 
   @Test
-  public void verify_installed_NodeHealthChecks_implementations() {
-    boolean standalone = new Random().nextBoolean();
-    when(webServer.isStandalone()).thenReturn(standalone);
+  public void verify_installed_NodeHealthChecks_implementations_when_standalone() {
+    when(webServer.isStandalone()).thenReturn(true);
     ComponentContainer container = new ComponentContainer();
 
     underTest.configure(container);
@@ -80,6 +79,22 @@ public class HealthActionModuleTest {
   }
 
   @Test
+  public void verify_installed_NodeHealthChecks_implementations_when_clustered() {
+    when(webServer.isStandalone()).thenReturn(false);
+    ComponentContainer container = new ComponentContainer();
+
+    underTest.configure(container);
+
+    List<Class<?>> checks = classesAddedToContainer(container).stream().filter(NodeHealthCheck.class::isAssignableFrom).collect(Collectors.toList());
+    assertThat(checks)
+      .hasSize(3)
+      .contains(WebServerStatusNodeCheck.class)
+      .contains(DbConnectionNodeCheck.class)
+      .contains(CeStatusNodeCheck.class)
+      .doesNotContain(EsStatusNodeCheck.class);
+  }
+
+  @Test
   public void verify_installed_ClusterHealthChecks_implementations_in_standalone() {
     when(webServer.isStandalone()).thenReturn(true);
     ComponentContainer container = new ComponentContainer();