Skip to content

Commit f60e517

Browse files
authored
Checking both node and cluster settings in NodeDeprecationChecks (#82487)
This commit changes NodeDeprecationChecks to look in both node settings and cluster settings when looking for deprecated or removed settings. This allows it to find settings that were set dynamically. Closes #82484
1 parent 40a3c65 commit f60e517

File tree

4 files changed

+224
-74
lines changed

4 files changed

+224
-74
lines changed

x-pack/plugin/deprecation/src/main/java/org/elasticsearch/xpack/deprecation/ClusterDeprecationChecks.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -659,6 +659,7 @@ static DeprecationIssue checkTemplatesWithCustomAndMultipleTypes(ClusterState st
659659
static DeprecationIssue checkClusterRoutingAllocationIncludeRelocationsSetting(final ClusterState clusterState) {
660660
return checkRemovedSetting(
661661
clusterState.metadata().settings(),
662+
null,
662663
CLUSTER_ROUTING_ALLOCATION_INCLUDE_RELOCATIONS_SETTING,
663664
"https://ela.st/es-deprecation-7-cluster-routing-allocation-disk-include-relocations-setting",
664665
"Relocating shards are always taken into account in 8.0.",

x-pack/plugin/deprecation/src/main/java/org/elasticsearch/xpack/deprecation/DeprecationChecks.java

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -101,29 +101,33 @@ private static Set<Setting<Boolean>> getAllDeprecatedNodeRolesSettings() {
101101
NodeDeprecationChecks::checkImplicitlyDisabledBasicRealms,
102102
NodeDeprecationChecks::checkReservedPrefixedRealmNames,
103103
(settings, pluginsAndModules, clusterState, licenseState) -> NodeDeprecationChecks.checkThreadPoolListenerQueueSize(
104-
settings
104+
settings,
105+
clusterState
106+
),
107+
(settings, pluginsAndModules, clusterState, licenseState) -> NodeDeprecationChecks.checkThreadPoolListenerSize(
108+
settings,
109+
clusterState
105110
),
106-
(settings, pluginsAndModules, clusterState, licenseState) -> NodeDeprecationChecks.checkThreadPoolListenerSize(settings),
107111
NodeDeprecationChecks::checkClusterRemoteConnectSetting,
108112
NodeDeprecationChecks::checkNodeLocalStorageSetting,
109113
(settings, pluginsAndModules, clusterState, licenseState) -> NodeDeprecationChecks
110-
.checkNodeBasicLicenseFeatureEnabledSetting(settings, XPackSettings.ENRICH_ENABLED_SETTING),
114+
.checkNodeBasicLicenseFeatureEnabledSetting(settings, XPackSettings.ENRICH_ENABLED_SETTING, clusterState),
111115
(settings, pluginsAndModules, clusterState, licenseState) -> NodeDeprecationChecks
112-
.checkNodeBasicLicenseFeatureEnabledSetting(settings, XPackSettings.FLATTENED_ENABLED),
116+
.checkNodeBasicLicenseFeatureEnabledSetting(settings, XPackSettings.FLATTENED_ENABLED, clusterState),
113117
(settings, pluginsAndModules, clusterState, licenseState) -> NodeDeprecationChecks
114-
.checkNodeBasicLicenseFeatureEnabledSetting(settings, XPackSettings.INDEX_LIFECYCLE_ENABLED),
118+
.checkNodeBasicLicenseFeatureEnabledSetting(settings, XPackSettings.INDEX_LIFECYCLE_ENABLED, clusterState),
115119
(settings, pluginsAndModules, clusterState, licenseState) -> NodeDeprecationChecks
116-
.checkNodeBasicLicenseFeatureEnabledSetting(settings, XPackSettings.MONITORING_ENABLED),
120+
.checkNodeBasicLicenseFeatureEnabledSetting(settings, XPackSettings.MONITORING_ENABLED, clusterState),
117121
(settings, pluginsAndModules, clusterState, licenseState) -> NodeDeprecationChecks
118-
.checkNodeBasicLicenseFeatureEnabledSetting(settings, XPackSettings.ROLLUP_ENABLED),
122+
.checkNodeBasicLicenseFeatureEnabledSetting(settings, XPackSettings.ROLLUP_ENABLED, clusterState),
119123
(settings, pluginsAndModules, clusterState, licenseState) -> NodeDeprecationChecks
120-
.checkNodeBasicLicenseFeatureEnabledSetting(settings, XPackSettings.SNAPSHOT_LIFECYCLE_ENABLED),
124+
.checkNodeBasicLicenseFeatureEnabledSetting(settings, XPackSettings.SNAPSHOT_LIFECYCLE_ENABLED, clusterState),
121125
(settings, pluginsAndModules, clusterState, licenseState) -> NodeDeprecationChecks
122-
.checkNodeBasicLicenseFeatureEnabledSetting(settings, XPackSettings.SQL_ENABLED),
126+
.checkNodeBasicLicenseFeatureEnabledSetting(settings, XPackSettings.SQL_ENABLED, clusterState),
123127
(settings, pluginsAndModules, clusterState, licenseState) -> NodeDeprecationChecks
124-
.checkNodeBasicLicenseFeatureEnabledSetting(settings, XPackSettings.TRANSFORM_ENABLED),
128+
.checkNodeBasicLicenseFeatureEnabledSetting(settings, XPackSettings.TRANSFORM_ENABLED, clusterState),
125129
(settings, pluginsAndModules, clusterState, licenseState) -> NodeDeprecationChecks
126-
.checkNodeBasicLicenseFeatureEnabledSetting(settings, XPackSettings.VECTORS_ENABLED),
130+
.checkNodeBasicLicenseFeatureEnabledSetting(settings, XPackSettings.VECTORS_ENABLED, clusterState),
127131
NodeDeprecationChecks::checkMultipleDataPaths,
128132
NodeDeprecationChecks::checkDataPathsList,
129133
NodeDeprecationChecks::checkBootstrapSystemCallFilterSetting,

0 commit comments

Comments
 (0)