Adjust index versions for skippers for time series#139670
Merged
martijnvg merged 2 commits intoelastic:patch/serverless-fixfrom Dec 17, 2025
Merged
Adjust index versions for skippers for time series#139670martijnvg merged 2 commits intoelastic:patch/serverless-fixfrom
martijnvg merged 2 commits intoelastic:patch/serverless-fixfrom
Conversation
Collaborator
|
Pinging @elastic/es-storage-engine (Team:StorageEngine) |
martijnvg
approved these changes
Dec 17, 2025
Member
martijnvg
left a comment
There was a problem hiding this comment.
I think this looks good. Let's wait for PR CI to complete.
I cherry-picked Jordan's PR that allows tsdb rolling upgrade tests to also test again serverless. If this passes this is a good indication that this actually addresses the problem.
| IndexVersion iv = SETTING_INDEX_VERSION_CREATED.get(s); | ||
| if (MODE.get(s) == IndexMode.TIME_SERIES) { | ||
| if (iv.onOrAfter(IndexVersions.SKIPPERS_ENABLED_BY_DEFAULT)) { | ||
| if (DOC_VALUES_SKIPPER && iv.onOrAfter(IndexVersions.SKIPPERS_ENABLED_BY_DEFAULT)) { |
Member
There was a problem hiding this comment.
This makes sense given that SKIPPERS_ENABLED_BY_DEFAULT was enabled when skippers were still behind feature flag.
| if (DOC_VALUES_SKIPPER && iv.onOrAfter(IndexVersions.SKIPPERS_ENABLED_BY_DEFAULT)) { | ||
| return "true"; | ||
| } | ||
| if (iv.onOrAfter(IndexVersions.STATELESS_SKIPPERS_ENABLED_FOR_TSDB)) { |
Member
There was a problem hiding this comment.
I think because of the broken if (DiscoveryNode.isStateless(s)) { check before, this should be correct. We need to use new STATELESS_SKIPPERS_ENABLED_FOR_TSDB to mark when skippers should be used.
romseygeek
approved these changes
Dec 17, 2025
jordan-powers
added a commit
that referenced
this pull request
Dec 18, 2025
jordan-powers
added a commit
to jordan-powers/elasticsearch
that referenced
this pull request
Dec 18, 2025
Bring the fixes from elastic#139532, elastic#139636, and elastic#139670 back into main.
elasticsearchmachine
pushed a commit
that referenced
this pull request
Dec 18, 2025
szybia
added a commit
to szybia/elasticsearch
that referenced
this pull request
Jan 7, 2026
* upstream/main: Add hook for blocking termination (elastic#133555) Delegate to ES93ScalarQuantizedVectorsFormat rather than copying behaviour (elastic#139834) Refactor compound block types (elastic#140219) Flush the rate buffer when the slice index changes (elastic#138856) Log linked project connection errors at debug during shutdown (elastic#140239) Periodic FIPS 140-3 buildkite pipelines (elastic#139909) ES|QL - Remove TERM function (elastic#139953) Fix name of started time field in shutdown status (elastic#139910) Drop `project_routing` from query params (elastic#140272) Fix flaky test: AllocationDecidersTests (elastic#140271) Add List Reindex API (elastic#140184) Expose _tier metadata attribute in ESQL (elastic#139894) Tweak TSDBRestEsqlIT#testTimeSeriesQuerying(...) (elastic#140210) Fix an OOM error when creating to many chained synonym graph token filter. (elastic#140026) Suppress Azure SDK error logs (elastic#139730) Rewritten integer sorts need to use SortedNumericSortField (elastic#139538) (elastic#139700) Adjust index versions for skippers for time series (elastic#139670) Fix host.name skippers index version range (elastic#139636) Remove BWC shim for a broken commit Fix index.mapping.use_doc_values_skipper defaults in serverless (elastic#139532)
sidosera
pushed a commit
to sidosera/elasticsearch
that referenced
this pull request
Jan 7, 2026
And move tsdb bwc tests to x-pack/logsdb (elastic#139671)
sidosera
pushed a commit
to sidosera/elasticsearch
that referenced
this pull request
Jan 7, 2026
And move tsdb bwc tests to x-pack/logsdb (elastic#139671)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
I suspect this will solve the problem currently in QA.
Unfortunately we don't have good BWC testing for time_series indices in serverless, so I can't prove it.