Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Deprecation check for No Master Block setting #38383

Merged
merged 5 commits into from
Feb 5, 2019
Merged

Deprecation check for No Master Block setting #38383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8dfbe92
Deprecation check for No Master Block setting
gwbrown Feb 5, 2019
763a9c6
Merge branch '6.x' into depcheck/no-master-block
gwbrown Feb 5, 2019
e70ae53
Review feedback
gwbrown Feb 5, 2019
c2585fa
Merge branch '6.x' into depcheck/no-master-block
gwbrown Feb 5, 2019
83916ff
Review feedback for Node checks
gwbrown Feb 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions ...precation/src/main/java/org/elasticsearch/xpack/deprecation/ClusterDeprecationChecks.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
import java.util.Objects;
import java.util.stream.Collectors;

import static org.elasticsearch.discovery.DiscoverySettings.NO_MASTER_BLOCK_SETTING;

public class ClusterDeprecationChecks {

static DeprecationIssue checkShardLimit(ClusterState state) {
Expand All @@ -37,6 +39,18 @@ static DeprecationIssue checkShardLimit(ClusterState state) {
return null;
}

static DeprecationIssue checkNoMasterBlock(ClusterState state) {
if (state.metaData().settings().hasValue(NO_MASTER_BLOCK_SETTING.getKey())) {
return new DeprecationIssue(DeprecationIssue.Level.WARNING,
"Master block setting will be renamed",
"https://www.elastic.co/guide/en/elasticsearch/reference/master/breaking-changes-7.0.html" +
"_new_name_for_literal_no_master_block_literal_setting",
"The setting discovery.zen.no_master_block will be renamed to cluster.no_master_block in 7.0. " +
"Please unset discovery.zen.no_master_block and set cluster.no_master_block after upgrading to 7.0.");
}
return null;
}

static DeprecationIssue checkClusterName(ClusterState state) {
String clusterName = state.getClusterName().value();
if (clusterName.contains(":")) {
Expand Down
2 changes: 2 additions & 0 deletions ...ugin/deprecation/src/main/java/org/elasticsearch/xpack/deprecation/DeprecationChecks.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,14 @@ private DeprecationChecks() {
Collections.unmodifiableList(Arrays.asList(
ClusterDeprecationChecks::checkUserAgentPipelines,
ClusterDeprecationChecks::checkShardLimit,
ClusterDeprecationChecks::checkNoMasterBlock,
ClusterDeprecationChecks::checkClusterName
));

static List<BiFunction<Settings, PluginsAndModules, DeprecationIssue>> NODE_SETTINGS_CHECKS =
Collections.unmodifiableList(Arrays.asList(
NodeDeprecationChecks::httpEnabledSettingRemoved,
NodeDeprecationChecks::noMasterBlockRenamed,
NodeDeprecationChecks::auditLogPrefixSettingsCheck,
NodeDeprecationChecks::indexThreadPoolCheck,
NodeDeprecationChecks::bulkThreadPoolCheck,
Expand Down
13 changes: 13 additions & 0 deletions .../deprecation/src/main/java/org/elasticsearch/xpack/deprecation/NodeDeprecationChecks.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@

import static org.elasticsearch.discovery.DiscoveryModule.DISCOVERY_HOSTS_PROVIDER_SETTING;
import static org.elasticsearch.discovery.DiscoveryModule.DISCOVERY_TYPE_SETTING;
import static org.elasticsearch.discovery.DiscoverySettings.NO_MASTER_BLOCK_SETTING;
import static org.elasticsearch.discovery.zen.SettingsBasedHostsProvider.DISCOVERY_ZEN_PING_UNICAST_HOSTS_SETTING;
import static org.elasticsearch.xpack.core.XPackSettings.SECURITY_ENABLED;
import static org.elasticsearch.xpack.core.XPackSettings.TRANSPORT_SSL_ENABLED;
Expand All @@ -44,6 +45,18 @@ static DeprecationIssue httpEnabledSettingRemoved(Settings nodeSettings, Plugins
return null;
}

static DeprecationIssue noMasterBlockRenamed(Settings nodeSettings, PluginsAndModules plugins) {
if (nodeSettings.hasValue(NO_MASTER_BLOCK_SETTING.getKey())) {
return new DeprecationIssue(DeprecationIssue.Level.CRITICAL,
"Master block setting renamed",
"https://www.elastic.co/guide/en/elasticsearch/reference/master/breaking-changes-7.0.html" +
"_new_name_for_literal_no_master_block_literal_setting",
"The setting discovery.zen.no_master_block will be renamed to cluster.no_master_block in 7.0. " +
"Please unset discovery.zen.no_master_block and set cluster.no_master_block after upgrading to 7.0.");
}
return null;
}

static DeprecationIssue auditLogPrefixSettingsCheck(Settings nodeSettings, PluginsAndModules plugins) {
if (nodeSettings.getByPrefix("xpack.security.audit.logfile.prefix").isEmpty() == false) {
return new DeprecationIssue(DeprecationIssue.Level.CRITICAL,
Expand Down
20 changes: 20 additions & 0 deletions ...tion/src/test/java/org/elasticsearch/xpack/deprecation/ClusterDeprecationChecksTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import java.util.List;

import static java.util.Collections.singletonList;
import static org.elasticsearch.discovery.DiscoverySettings.NO_MASTER_BLOCK_SETTING;
import static org.elasticsearch.xpack.deprecation.DeprecationChecks.CLUSTER_SETTINGS_CHECKS;

public class ClusterDeprecationChecksTests extends ESTestCase {
Expand All @@ -45,6 +46,25 @@ public void testCheckClusterName() {
assertTrue(noIssues.isEmpty());
}

public void testCheckNoMasterBlock() {
MetaData metaData = MetaData.builder()
.persistentSettings(Settings.builder()
.put(NO_MASTER_BLOCK_SETTING.getKey(), randomFrom("all", "write"))
.build())
.build();
ClusterState state = ClusterState.builder(new ClusterName("test"))
.metaData(metaData)
.build();
DeprecationIssue expected = new DeprecationIssue(DeprecationIssue.Level.WARNING,
"Master block setting will be renamed",
"https://www.elastic.co/guide/en/elasticsearch/reference/master/breaking-changes-7.0.html" +
"_new_name_for_literal_no_master_block_literal_setting",
"The setting discovery.zen.no_master_block will be renamed to cluster.no_master_block in 7.0. " +
"Please unset discovery.zen.no_master_block and set cluster.no_master_block after upgrading to 7.0.");
List<DeprecationIssue> issues = DeprecationChecks.filterChecks(CLUSTER_SETTINGS_CHECKS, c -> c.apply(state));
assertEquals(singletonList(expected), issues);
}

public void testCheckShardLimit() {
int shardsPerNode = randomIntBetween(2, 10000);
int nodeCount = randomIntBetween(1, 10);
Expand Down
12 changes: 12 additions & 0 deletions ...ecation/src/test/java/org/elasticsearch/xpack/deprecation/NodeDeprecationChecksTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import static org.elasticsearch.cluster.ClusterName.CLUSTER_NAME_SETTING;
import static org.elasticsearch.discovery.DiscoveryModule.DISCOVERY_HOSTS_PROVIDER_SETTING;
import static org.elasticsearch.discovery.DiscoveryModule.DISCOVERY_TYPE_SETTING;
import static org.elasticsearch.discovery.DiscoverySettings.NO_MASTER_BLOCK_SETTING;
import static org.elasticsearch.node.Node.NODE_NAME_SETTING;
import static org.elasticsearch.xpack.deprecation.DeprecationChecks.NODE_SETTINGS_CHECKS;

Expand Down Expand Up @@ -84,6 +85,17 @@ public void testHttpEnabledCheck() {
assertSettingsAndIssue("http.enabled", Boolean.toString(randomBoolean()), expected);
}

public void testNoMasterBlockRenamed() {
DeprecationIssue expected = new DeprecationIssue(DeprecationIssue.Level.CRITICAL,
"Master block setting renamed",
"https://www.elastic.co/guide/en/elasticsearch/reference/master/breaking-changes-7.0.html" +
"_new_name_for_literal_no_master_block_literal_setting",
"The setting discovery.zen.no_master_block will be renamed to cluster.no_master_block in 7.0. " +
"Please unset discovery.zen.no_master_block and set cluster.no_master_block after upgrading to 7.0.");

assertSettingsAndIssue(NO_MASTER_BLOCK_SETTING.getKey(), randomFrom("all", "write"), expected);
}

public void testAuditLoggingPrefixSettingsCheck() {
DeprecationIssue expected = new DeprecationIssue(DeprecationIssue.Level.CRITICAL,
"Audit log node info settings renamed",
Expand Down