Skip to content

Enable validation for versionSettings #95874

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
merged 4 commits into from
May 5, 2023
Merged

Enable validation for versionSettings #95874

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dc4d8a5
Enable validation for versionSettings
thecoop May 5, 2023
a476396
Update docs/changelog/95874.yaml
thecoop May 5, 2023
798ca19
Fix changelog
thecoop May 5, 2023
810bfd8
Fix incorrect ranges in NodeJoinExecutorTests
thecoop May 5, 2023
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions docs/changelog/95874.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
pr: 95874
summary: Enable validation for `versionSettings`
area: "Infra/Settings"
type: bug
issues:
- 95873
2 changes: 1 addition & 1 deletion server/src/main/java/org/elasticsearch/common/settings/Setting.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1278,7 +1278,7 @@ public static Setting<Version> versionSetting(
Validator<Version> validator,
Property... properties
) {
return new Setting<>(key, fallbackSetting, s -> Version.fromId(Integer.parseInt(s)), properties);
return new Setting<>(key, fallbackSetting, s -> Version.fromId(Integer.parseInt(s)), validator, properties);
}

public static Setting<Float> floatSetting(String key, float defaultValue, Property... properties) {
Expand Down
8 changes: 6 additions & 2 deletions server/src/test/java/org/elasticsearch/cluster/coordination/NodeJoinExecutorTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,9 +189,13 @@ public void testSuccess() {
public static Settings.Builder randomCompatibleVersionSettings() {
Settings.Builder builder = Settings.builder();
if (randomBoolean()) {
builder.put(IndexMetadata.SETTING_VERSION_CREATED, getRandomCompatibleVersion());
Version createdVersion = getRandomCompatibleVersion();
builder.put(IndexMetadata.SETTING_VERSION_CREATED, createdVersion);
if (randomBoolean()) {
builder.put(IndexMetadata.SETTING_VERSION_COMPATIBILITY, getRandomCompatibleVersion());
builder.put(
IndexMetadata.SETTING_VERSION_COMPATIBILITY,
VersionUtils.randomVersionBetween(random(), createdVersion, Version.CURRENT)
);
}
} else {
builder.put(IndexMetadata.SETTING_VERSION_CREATED, randomFrom(Version.fromString("5.0.0"), Version.fromString("6.0.0")));
Expand Down