Skip on any node capability being present #111585
Merged
Conversation
This file contains 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
thecoop
added
>test
|
Pinging @elastic/es-core-infra (Team:Core/Infra) |
elasticsearchmachine
added
Team:Core/Infra
Get the check working properly
mosche
approved these changes
Aug 5, 2024
| @@ -291,8 +299,46 @@ public Optional<Boolean> clusterHasCapabilities(String method, String path, Stri | |||
| params.put("capabilities", capabilitiesString); | |||
| } | |||
| params.put("error_trace", "false"); // disable error trace | |||
|
|
|||
| if (clusterHasFeature(RestNodesCapabilitiesAction.LOCAL_ONLY_CAPABILITIES.id()) == false) { | |||
There was a problem hiding this comment.
Suggested change
| if (clusterHasFeature(RestNodesCapabilitiesAction.LOCAL_ONLY_CAPABILITIES.id()) == false) { | |
| if (any == false || clusterHasFeature(RestNodesCapabilitiesAction.LOCAL_ONLY_CAPABILITIES.id()) == false) { |
Isn't this case also what we'd like to use by default if any is false? Obviously below works as well, but this one is easier to understand I think.
There was a problem hiding this comment.
I'm on the fence with this one, I think it's helpful to have all the logic used by tests in the same place, so we're not depending on cluster implementation for one and not the other. Could easily be swayed the other way though.
There was a problem hiding this comment.
I don't have a strong preference to be honest. Consistently doing things a certain way seems beneficial, but I also see value of exercising the default path in tests as much as possible. Leaving it up to you ;)
thecoop
added a commit
that referenced
this pull request
Aug 7, 2024
weizijun
added a commit
to weizijun/elasticsearch
that referenced
this pull request
Aug 7, 2024
* upstream/main: (132 commits) Fix compile after several merges Update docs with new behavior on skip conditions (elastic#111640) Skip on any instance of node or version features being present (elastic#111268) Skip on any node capability being present (elastic#111585) [DOCS] Publishes Anthropic inference service docs. (elastic#111619) Introduce `ChunkedZipResponse` (elastic#109820) [Gradle] fix esql compile cacheability (elastic#111651) Mute org.elasticsearch.datastreams.logsdb.qa.StandardVersusLogsIndexModeChallengeRestIT testTermsQuery elastic#111666 Mute org.elasticsearch.datastreams.logsdb.qa.StandardVersusLogsIndexModeChallengeRestIT testMatchAllQuery elastic#111664 Mute org.elasticsearch.xpack.esql.analysis.VerifierTests testMatchCommand elastic#111661 Mute org.elasticsearch.xpack.esql.optimizer.LocalPhysicalPlanOptimizerTests testMatchCommandWithMultipleMatches {default} elastic#111660 Mute org.elasticsearch.xpack.esql.optimizer.LocalPhysicalPlanOptimizerTests testMatchCommand {default} elastic#111659 Mute org.elasticsearch.xpack.esql.optimizer.LocalPhysicalPlanOptimizerTests testMatchCommandWithWhereClause {default} elastic#111658 LogsDB qa tests - add specific matcher for source (elastic#111568) ESQL: Move `randomLiteral` (elastic#111647) [ESQL] Clean up UNSUPPORTED type blocks (elastic#111648) ESQL: Remove the `NESTED` DataType (elastic#111495) ESQL: Move more out of esql-core (elastic#111604) Improve MvPSeriesWeightedSum edge case and add more tests (elastic#111552) Add link to flood-stage watermark exception message (elastic#111315) ... # Conflicts: # server/src/main/java/org/elasticsearch/TransportVersions.java
rjernst
pushed a commit
to rjernst/elasticsearch
that referenced
this pull request
Aug 7, 2024
Update capabilities skip behavior to skip on any node having the capability, not all nodes
rjernst
pushed a commit
to rjernst/elasticsearch
that referenced
this pull request
Aug 7, 2024
elastic#111585 and elastic#111268 change the behavior to skip on any node having the feature/capability, not all nodes
mhl-b
pushed a commit
that referenced
this pull request
Aug 8, 2024
Update capabilities skip behavior to skip on any node having the capability, not all nodes
mhl-b
pushed a commit
that referenced
this pull request
Aug 8, 2024
cbuescher
pushed a commit
to cbuescher/elasticsearch
that referenced
this pull request
Sep 4, 2024
Update capabilities skip behavior to skip on any node having the capability, not all nodes
cbuescher
pushed a commit
to cbuescher/elasticsearch
that referenced
this pull request
Sep 4, 2024
elastic#111585 and elastic#111268 change the behavior to skip on any node having the feature/capability, not all nodes
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Counterpart to #111268, skip on any capability being present