Abstract version features checking to work with non-semantic versions #137199
Conversation
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
ldematte
added
>test
ldematte
commented
Oct 27, 2025
Collaborator
|
Pinging @elastic/es-core-infra (Team:Core/Infra) |
…sticsearch into fix-version-features-nonsem
mosche
approved these changes
Oct 28, 2025
Contributor
mosche
left a comment
mosche
left a comment
There was a problem hiding this comment.
lgtm, just a minor comment regarding visibility of ESRestTestFeatureService
test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java
Outdated
Show resolved
Hide resolved
| if (semanticNodeVersions.isEmpty()) { | ||
| // Nodes do not have a semantic version (e.g. serverless). | ||
| // We assume the cluster is on the "latest version", and all is supported. | ||
| return ((featureVersion, any) -> true); |
| } | ||
|
|
||
| return checkCollection(nodeVersions, v -> v.onOrAfter(extractedVersion), any); | ||
| return versionFeaturesPredicate.test(extractedVersion, any); |
Contributor
There was a problem hiding this comment.
optional nit... it took me a bit to recall what any was, maybe we should rename to anyMatch, matchAny, isAnySufficient ...
Contributor
Author
There was a problem hiding this comment.
Same :)
At least is consistent all the way, but I'll try and come up with a better name for it
Contributor
Author
There was a problem hiding this comment.
Renamed.
I'm not entirely happy yet, I think I might do a followup that either splits the functions or uses an enum for better clarity (here but mainly in TestFeatureService#clusterHasFeature)
test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestFeatureService.java
Outdated
Show resolved
Hide resolved
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
When I resumed work on #105641 (now #136853), I had some serverless tests failures.
When we moved away from Version in ESRestTest, we added fallbacks for non-sematic versions, which applied the concept "not a semantic version? We assume everything is "current" and supported", which played well for e.g. serverless.
Down the road we acquired the concept of "version features", but we lost this concept; now tests with e.g.
skip: gte_v720are failing on serverless because it does not have a "7.2.0" node (*)This PR fixes the problem by re-introducing the
non-semver == current versionequivalency via a version features predicate.(*) after applying #136853