honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix issue that deprecated setting 'cluster.initial_master_nodes' is not identified in node bootstrap check (#2779) 

* Fix issue that deprecated setting 'cluster.initial_master_nodes' is not identified during node bootstrap

Signed-off-by: Tianli Feng <ftianli@amazon.com>

* Restore a variable name

Signed-off-by: Tianli Feng <ftianli@amazon.com>
This commit is contained in:
Tianli Feng 2022-04-06 12:01:12 -07:00 committed by GitHub
parent ce5c55dbbc
commit dd24e17ea6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
server/src/main/java/org/opensearch/cluster/coordination/ClusterBootstrapService.java
View File

@ -113,12 +113,12 @@ public class ClusterBootstrapService {
BooleanSupplier isBootstrappedSupplier, BooleanSupplier isBootstrappedSupplier,
Consumer<VotingConfiguration> votingConfigurationConsumer Consumer<VotingConfiguration> votingConfigurationConsumer
) { ) {
// TODO: Remove variable 'initialClusterManagerSettingName' after removing MASTER_ROLE.
String initialClusterManagerSettingName = INITIAL_CLUSTER_MANAGER_NODES_SETTING.exists(settings)
? INITIAL_CLUSTER_MANAGER_NODES_SETTING.getKey()
: INITIAL_MASTER_NODES_SETTING.getKey();
if (DiscoveryModule.isSingleNodeDiscovery(settings)) { if (DiscoveryModule.isSingleNodeDiscovery(settings)) {
if (INITIAL_CLUSTER_MANAGER_NODES_SETTING.existsOrFallbackExists(settings)) { if (INITIAL_CLUSTER_MANAGER_NODES_SETTING.existsOrFallbackExists(settings)) {
// TODO: Remove variable 'initialClusterManagerSettingName' after removing MASTER_ROLE.
String initialClusterManagerSettingName = INITIAL_CLUSTER_MANAGER_NODES_SETTING.exists(settings)
? INITIAL_CLUSTER_MANAGER_NODES_SETTING.getKey()
: INITIAL_MASTER_NODES_SETTING.getKey();
throw new IllegalArgumentException( throw new IllegalArgumentException(
"setting [" "setting ["
+ initialClusterManagerSettingName + initialClusterManagerSettingName
@ -145,7 +145,7 @@ public class ClusterBootstrapService {
bootstrapRequirements = unmodifiableSet(new LinkedHashSet<>(initialMasterNodes)); bootstrapRequirements = unmodifiableSet(new LinkedHashSet<>(initialMasterNodes));
if (bootstrapRequirements.size() != initialMasterNodes.size()) { if (bootstrapRequirements.size() != initialMasterNodes.size()) {
throw new IllegalArgumentException( throw new IllegalArgumentException(
"setting [" + INITIAL_CLUSTER_MANAGER_NODES_SETTING.getKey() + "] contains duplicates: " + initialMasterNodes "setting [" + initialClusterManagerSettingName + "] contains duplicates: " + initialMasterNodes
); );
} }
unconfiguredBootstrapTimeout = discoveryIsConfigured(settings) ? null : UNCONFIGURED_BOOTSTRAP_TIMEOUT_SETTING.get(settings); unconfiguredBootstrapTimeout = discoveryIsConfigured(settings) ? null : UNCONFIGURED_BOOTSTRAP_TIMEOUT_SETTING.get(settings);
@ -163,7 +163,8 @@ public class ClusterBootstrapService {
LEGACY_DISCOVERY_HOSTS_PROVIDER_SETTING, LEGACY_DISCOVERY_HOSTS_PROVIDER_SETTING,
DISCOVERY_SEED_HOSTS_SETTING, DISCOVERY_SEED_HOSTS_SETTING,
LEGACY_DISCOVERY_ZEN_PING_UNICAST_HOSTS_SETTING, LEGACY_DISCOVERY_ZEN_PING_UNICAST_HOSTS_SETTING,
INITIAL_CLUSTER_MANAGER_NODES_SETTING INITIAL_CLUSTER_MANAGER_NODES_SETTING,
INITIAL_MASTER_NODES_SETTING
).anyMatch(s -> s.exists(settings)); ).anyMatch(s -> s.exists(settings));
} }

2
server/src/test/java/org/opensearch/bootstrap/BootstrapChecksTests.java
View File

@ -818,5 +818,7 @@ public class BootstrapChecksTests extends AbstractBootstrapCheckTestCase {
ensureChecksPass.accept(Settings.builder().putList(ClusterBootstrapService.INITIAL_CLUSTER_MANAGER_NODES_SETTING.getKey())); ensureChecksPass.accept(Settings.builder().putList(ClusterBootstrapService.INITIAL_CLUSTER_MANAGER_NODES_SETTING.getKey()));
ensureChecksPass.accept(Settings.builder().putList(DiscoveryModule.DISCOVERY_SEED_PROVIDERS_SETTING.getKey())); ensureChecksPass.accept(Settings.builder().putList(DiscoveryModule.DISCOVERY_SEED_PROVIDERS_SETTING.getKey()));
ensureChecksPass.accept(Settings.builder().putList(SettingsBasedSeedHostsProvider.DISCOVERY_SEED_HOSTS_SETTING.getKey())); ensureChecksPass.accept(Settings.builder().putList(SettingsBasedSeedHostsProvider.DISCOVERY_SEED_HOSTS_SETTING.getKey()));
// Validate the deprecated setting is still valid during the node bootstrap.
ensureChecksPass.accept(Settings.builder().putList(ClusterBootstrapService.INITIAL_MASTER_NODES_SETTING.getKey()));
} }
} }

11
server/src/test/java/org/opensearch/cluster/coordination/ClusterBootstrapServiceTests.java
View File

@ -166,10 +166,19 @@ public class ClusterBootstrapServiceTests extends OpenSearchTestCase {
testDoesNothingWithSettings(builder().putList(DISCOVERY_SEED_HOSTS_SETTING.getKey())); testDoesNothingWithSettings(builder().putList(DISCOVERY_SEED_HOSTS_SETTING.getKey()));
} }
public void testDoesNothingByDefaultIfMasterNodesConfigured() { public void testDoesNothingByDefaultIfClusterManagerNodesConfigured() {
testDoesNothingWithSettings(builder().putList(INITIAL_CLUSTER_MANAGER_NODES_SETTING.getKey())); testDoesNothingWithSettings(builder().putList(INITIAL_CLUSTER_MANAGER_NODES_SETTING.getKey()));
} }
// Validate the deprecated setting is still valid during the cluster bootstrap.
public void testDoesNothingByDefaultIfMasterNodesConfigured() {
testDoesNothingWithSettings(builder().putList(INITIAL_MASTER_NODES_SETTING.getKey()));
assertWarnings(
"[cluster.initial_master_nodes] setting was deprecated in OpenSearch and will be removed in a future release! "
+ "See the breaking changes documentation for the next major version."
);
}
public void testDoesNothingByDefaultOnMasterIneligibleNodes() { public void testDoesNothingByDefaultOnMasterIneligibleNodes() {
localNode = new DiscoveryNode( localNode = new DiscoveryNode(
"local", "local",