Skip to content

Fix host.name skippers index version range #139636

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
jordan-powers merged 2 commits into from
Dec 16, 2025
Merged

Fix host.name skippers index version range #139636

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dc239d9
Revert "Remove BWC shim for a broken commit"
jordan-powers Dec 16, 2025
c4c255e
Fix indexversion range check on hostname skippers
jordan-powers Dec 16, 2025
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
9 changes: 7 additions & 2 deletions server/src/main/java/org/elasticsearch/index/IndexSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -770,6 +770,7 @@ public Iterator<Setting<?>> settings() {
Property.ServerlessPublic
);

private static final boolean DOC_VALUES_SKIPPER = new FeatureFlag("doc_values_skipper").isEnabled();
public static final Setting<Boolean> USE_DOC_VALUES_SKIPPER = Setting.boolSetting("index.mapping.use_doc_values_skipper", s -> {
IndexVersion iv = SETTING_INDEX_VERSION_CREATED.get(s);
if (MODE.get(s) == IndexMode.TIME_SERIES) {
Expand All @@ -778,6 +779,11 @@ public Iterator<Setting<?>> settings() {
}
return "false";
} else {
if (DOC_VALUES_SKIPPER
&& iv.onOrAfter(IndexVersions.SKIPPERS_ENABLED_BY_DEFAULT)
&& iv.before(IndexVersions.SKIPPER_DEFAULTS_ONLY_ON_TSDB)) {
Comment on lines +783 to +784
Copy link
Contributor

@Kubik42 Kubik42 Dec 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[nit] you can use between()

Copy link
Contributor Author

@jordan-powers jordan-powers Dec 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point but it's probably not worth delaying the release by fixing this and re-running CI. But we can address this in a follow-up when we merge the fix back to main.

return "true";
}
return "false";
}
}, Property.IndexScope, Property.Final);
Expand Down Expand Up @@ -1245,8 +1251,7 @@ public IndexSettings(final IndexMetadata indexMetadata, final Settings nodeSetti
useDocValuesSkipper = scopedSettings.get(USE_DOC_VALUES_SKIPPER);
useDocValuesSkipperForHostname = USE_DOC_VALUES_SKIPPER.exists(settings)
? scopedSettings.get(USE_DOC_VALUES_SKIPPER)
: version.onOrAfter(IndexVersions.SKIPPERS_ENABLED_BY_DEFAULT)
&& version.before(IndexVersions.STATELESS_SKIPPERS_ENABLED_FOR_TSDB);
: version.onOrAfter(IndexVersions.SKIPPERS_ENABLED_BY_DEFAULT) && version.before(IndexVersions.SKIPPER_DEFAULTS_ONLY_ON_TSDB);
seqNoIndexOptions = scopedSettings.get(SEQ_NO_INDEX_OPTIONS_SETTING);
useTimeSeriesDocValuesFormat = scopedSettings.get(USE_TIME_SERIES_DOC_VALUES_FORMAT_SETTING);
useTimeSeriesDocValuesFormatLargeBlockSize = scopedSettings.get(USE_TIME_SERIES_DOC_VALUES_FORMAT_LARGE_BLOCK_SIZE);
Expand Down