Add both cluster.initial_cluster_manager_nodes and cluster.initial_ma…

…ster_nodes into an error message of BootstrapChecks Signed-off-by: Tianli Feng <ftianli@amazon.com>
opensearch-project · Mar 17, 2022 · 2ee85da · 2ee85da
1 parent c967ad4
commit 2ee85da
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/server/src/main/java/org/opensearch/bootstrap/BootstrapChecks.java b/server/src/main/java/org/opensearch/bootstrap/BootstrapChecks.java
@@ -64,6 +64,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import static org.opensearch.cluster.coordination.ClusterBootstrapService.INITIAL_CLUSTER_MANAGER_NODES_SETTING;
 import static org.opensearch.cluster.coordination.ClusterBootstrapService.INITIAL_MASTER_NODES_SETTING;
 import static org.opensearch.discovery.DiscoveryModule.DISCOVERY_SEED_PROVIDERS_SETTING;
 import static org.opensearch.discovery.SettingsBasedSeedHostsProvider.DISCOVERY_SEED_HOSTS_SETTING;
@@ -773,10 +774,12 @@ public BootstrapCheckResult check(BootstrapContext context) {
             return BootstrapCheckResult.failure(
                 String.format(
                     Locale.ROOT,
-                    "the default discovery settings are unsuitable for production use; at least one of [%s] must be configured",
-                    Stream.of(DISCOVERY_SEED_HOSTS_SETTING, DISCOVERY_SEED_PROVIDERS_SETTING, INITIAL_MASTER_NODES_SETTING)
+                    // TODO: Remove ' / %s' from the error message after removing MASTER_ROLE, and update unit test.
+                    "the default discovery settings are unsuitable for production use; at least one of [%s / %s] must be configured",
+                    Stream.of(DISCOVERY_SEED_HOSTS_SETTING, DISCOVERY_SEED_PROVIDERS_SETTING, INITIAL_CLUSTER_MANAGER_NODES_SETTING)
                         .map(Setting::getKey)
-                        .collect(Collectors.joining(", "))
+                        .collect(Collectors.joining(", ")),
+                    INITIAL_MASTER_NODES_SETTING.getKey()
                 )
             );
         }

diff --git a/server/src/test/java/org/opensearch/bootstrap/BootstrapChecksTests.java b/server/src/test/java/org/opensearch/bootstrap/BootstrapChecksTests.java
@@ -802,7 +802,7 @@ public void testDiscoveryConfiguredCheck() throws NodeValidationException {
             hasToString(
                 containsString(
                     "the default discovery settings are unsuitable for production use; at least one "
-                        + "of [discovery.seed_hosts, discovery.seed_providers, cluster.initial_master_nodes] must be configured"
+                        + "of [discovery.seed_hosts, discovery.seed_providers, cluster.initial_cluster_manager_nodes / cluster.initial_master_nodes] must be configured"
                 )
             )
         );