Skip to content

Not reporting removable settings for deprecated affix settings #84246

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

Merged
masseyke merged 1 commit into from
Feb 23, 2022
Merged

Not reporting removable settings for deprecated affix settings #84246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 8 additions & 5 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 @@ -1461,10 +1461,10 @@ private static DeprecationIssue deprecatedAffixSetting(
if (canBeFixedByRemovingDynamicSetting) {
deprecatedClusterSettingKeys.removeAll(deprecatedNodeSettingKeys);
}
final Map<String, Object> meta = createMetaMapForRemovableSettings(
canBeFixedByRemovingDynamicSetting,
deprecatedClusterSettingKeys
);
/* Removing affix settings can cause more problems than it's worth, so always make meta null even if the settings are only set
* dynamically
*/
final Map<String, Object> meta = null;
return new DeprecationIssue(warningLevel, message, url, details, false, meta);
}

Expand Down Expand Up @@ -1523,7 +1523,10 @@ private static DeprecationIssue deprecatedAffixGroupedSetting(
if (canBeFixedByRemovingDynamicSetting) {
allClusterSubSettingKeys.removeAll(allNodeSubSettingKeys);
}
final Map<String, Object> meta = createMetaMapForRemovableSettings(canBeFixedByRemovingDynamicSetting, allClusterSubSettingKeys);
/* Removing affix settings can cause more problems than it's worth, so always make meta null even if the settings are only set
* dynamically
*/
final Map<String, Object> meta = null;
return new DeprecationIssue(warningLevel, message, url, details, false, meta);
}

Expand Down
2 changes: 1 addition & 1 deletion ...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 @@ -1893,7 +1893,7 @@ void monitoringExporterGroupedSetting(String suffix, String value) throws JsonPr
c -> c.apply(nodeSettings, null, clusterState, licenseState)
);
final String expectedUrl = "https://ela.st/es-deprecation-7-monitoring-settings";
Map<String, Object> meta = buildMetaObjectForRemovableSettings(subSetting1Key2, subSetting2Key2);
Map<String, Object> meta = null;
assertThat(
issues,
hasItem(
Expand Down