From 01559391e6b685b49501e2c9a1483b019470e7bf Mon Sep 17 00:00:00 2001 From: Peter Nied Date: Mon, 25 Apr 2022 11:09:45 -0500 Subject: [PATCH] Rename cluster settings following new 2.x convention (#1746) Previously the setting was `cluster.initial_master_nodes` and has since changed to `cluster.initial_cluster_manager_nodes`. This was causing issues due to a bug in the fallback method that has been fixed in OpenSearch, but getting ahead of this change before its needed. See related https://github.com/opensearch-project/OpenSearch/pull/2779 Signed-off-by: Peter Nied --- .../opensearch/security/test/helper/cluster/ClusterHelper.java | 2 +- tools/install_demo_configuration.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/java/org/opensearch/security/test/helper/cluster/ClusterHelper.java b/src/test/java/org/opensearch/security/test/helper/cluster/ClusterHelper.java index bc1d5d8ff9..6436ab5ace 100644 --- a/src/test/java/org/opensearch/security/test/helper/cluster/ClusterHelper.java +++ b/src/test/java/org/opensearch/security/test/helper/cluster/ClusterHelper.java @@ -367,7 +367,7 @@ private Settings.Builder getMinimumNonSecurityNodeSettingsBuilder(final int node .put("path.logs", "./target/data/"+clustername+"/logs") .put("node.max_local_storage_nodes", nodeCount) //.put("discovery.zen.minimum_master_nodes", minMasterNodes(masterTcpPorts.size())) - .putList("cluster.initial_master_nodes", masterTcpPorts.stream().map(s->"127.0.0.1:"+s).collect(Collectors.toList())) + .putList("cluster.initial_cluster_manager_nodes", masterTcpPorts.stream().map(s->"127.0.0.1:"+s).collect(Collectors.toList())) //.put("discovery.zen.no_master_block", "all") //.put("discovery.zen.fd.ping_timeout", "5s") .put("discovery.initial_state_timeout","8s") diff --git a/tools/install_demo_configuration.sh b/tools/install_demo_configuration.sh index cb13ef0756..aa7c736b47 100755 --- a/tools/install_demo_configuration.sh +++ b/tools/install_demo_configuration.sh @@ -387,7 +387,7 @@ else if [ "$cluster_mode" == 1 ]; then echo "network.host: 0.0.0.0" | $SUDO_CMD tee -a "$OPENSEARCH_CONF_FILE" > /dev/null echo "node.name: smoketestnode" | $SUDO_CMD tee -a "$OPENSEARCH_CONF_FILE" > /dev/null - echo "cluster.initial_master_nodes: smoketestnode" | $SUDO_CMD tee -a "$OPENSEARCH_CONF_FILE" > /dev/null + echo "cluster.initial_cluster_manager_nodes: smoketestnode" | $SUDO_CMD tee -a "$OPENSEARCH_CONF_FILE" > /dev/null fi fi