diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/health/TransportClusterHealthAction.java b/server/src/main/java/org/opensearch/action/admin/cluster/health/TransportClusterHealthAction.java index 137baf7005b8c..d475826b059d8 100644 --- a/server/src/main/java/org/opensearch/action/admin/cluster/health/TransportClusterHealthAction.java +++ b/server/src/main/java/org/opensearch/action/admin/cluster/health/TransportClusterHealthAction.java @@ -283,6 +283,7 @@ private void executeHealth( if (request.ensureNodeWeighedIn()) { if (clusterHealthResponse.hasDiscoveredClusterManager() == false) { listener.onFailure(new ClusterManagerNotDiscoveredException("cluster-manager not discovered")); + return; } else { DiscoveryNode localNode = currentState.getNodes().getLocalNode(); // TODO: make this check more generic, check for node role instead