Convert flaky yml tests to EsRestTestCases #63634
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
This use case is covered in the `TimeseriesLifecycleActionIT` in several tests like: `testMoveToAllocateStep` or `testMoveToRolloverStep`
The yml "Test Invalid Move To Step With Invalid Next Step" worked based on assuming the current step is a particular one. As we can't control the timing of ILM and we can't busy assert in yml test, this converts the test to a java test and makes use of `assertBusy`
This converts the explain lifecycle yml tests that depende on ILM having run at least once to a java integration test that makes use of `assertBusy`.
andreidan
added
>test
|
Pinging @elastic/es-core-features (:Core/Features/ILM+SLM) |
elasticmachine
added
the
Team:Data Management
dakrone
approved these changes
Oct 13, 2020
| @@ -228,6 +242,15 @@ public static void createIndexWithSettings(RestClient client, String index, Stri | |||
| ensureGreen(index); | |||
| } | |||
|
|
|||
| public static void createIndexWithSettingsNoAlias(RestClient client, String index, Settings.Builder settings) throws IOException { | |||
There was a problem hiding this comment.
Maybe instead of adding a helper (it's also strange that it's called "NoAlias" since the default should always be no alias), we should change the other createIndexWithSettings to make the alias @Nullable?
There was a problem hiding this comment.
I've renamed the method createIndexWithSettings (c399088) with signature:
public static void createIndexWithSettings(RestClient client, String index, Settings.Builder settings) throws IOException {
I think piggybacking this use case on the helper that has the alias and useWriteIndex parameters by making both @Nullable over complicates the logic (and we'd end up passing 2 null parameters).
What do you think?
| public static void createIndexWithSettingsNoAlias(RestClient client, String index, Settings.Builder settings) throws IOException { | ||
| Request request = new Request("PUT", "/" + index); | ||
| request.setJsonEntity("{\n \"settings\": " + Strings.toString(settings.build()) | ||
| + "}"); |
There was a problem hiding this comment.
Super minor, but probably no need for a newline here :)
| assertManagedIndex(explain.get(secondIndex)); | ||
| assertUnmanagedIndex(explain.get(unmanagedIndex)); | ||
|
|
||
| Map<String, Object> explainIndexWithMissingPolicy = explain.get(indexWithMissingPolicy); |
There was a problem hiding this comment.
I think we could probably put this one is a second assertBusy so that we don't end up doing two explains when we only need to do one
There was a problem hiding this comment.
There's only one explain API call in this assertBusy. I believe it's ok to leave it in one assertBusy call.
|
@elasticmachine update branch |
andreidan
added a commit
to andreidan/elasticsearch
that referenced
this pull request
Oct 27, 2020
The yml "Test Invalid Move To Step With Invalid Next Step" worked based on assuming the current step is a particular one. As we can't control the timing of ILM and we can't busy assert in yml test, this converts the test to a java test and makes use of `assertBusy` This converts the explain lifecycle yml tests that depende on ILM having run at least once to a java integration test that makes use of `assertBusy`. (cherry picked from commit 6afd042) Signed-off-by: Andrei Dan <andrei.dan@elastic.co>
andreidan
added a commit
that referenced
this pull request
Oct 27, 2020
The yml "Test Invalid Move To Step With Invalid Next Step" worked based on assuming the current step is a particular one. As we can't control the timing of ILM and we can't busy assert in yml test, this converts the test to a java test and makes use of `assertBusy` This converts the explain lifecycle yml tests that depende on ILM having run at least once to a java integration test that makes use of `assertBusy`. (cherry picked from commit 6afd042) Signed-off-by: Andrei Dan <andrei.dan@elastic.co>
andreidan
added a commit
to andreidan/elasticsearch
that referenced
this pull request
Nov 4, 2020
The yml "Test Invalid Move To Step With Invalid Next Step" worked based on assuming the current step is a particular one. As we can't control the timing of ILM and we can't busy assert in yml test, this converts the test to a java test and makes use of `assertBusy` This converts the explain lifecycle yml tests that depende on ILM having run at least once to a java integration test that makes use of `assertBusy`. (cherry picked from commit 6afd042) Signed-off-by: Andrei Dan <andrei.dan@elastic.co>
andreidan
added a commit
that referenced
this pull request
Nov 4, 2020
The yml "Test Invalid Move To Step With Invalid Next Step" worked based on assuming the current step is a particular one. As we can't control the timing of ILM and we can't busy assert in yml test, this converts the test to a java test and makes use of `assertBusy` This converts the explain lifecycle yml tests that depende on ILM having run at least once to a java integration test that makes use of `assertBusy`. (cherry picked from commit 6afd042) Signed-off-by: Andrei Dan <andrei.dan@elastic.co>
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.
We've had several failures in the yml ILM tests because ILM doesn't run in a deterministic way
and we can't wait for it to run in the yml test. The latest failure,
field [indices.another_index.phase] is null,is another symptom.
This PR converts the ILM yml tests that rely on ILM having run (eg. successful explain api
output tests for managed indices, valid and invalid move to step api tests that specify the
correct current step) into
ESRestTestCasetests that make use of theassertBusyprimitive.Resolves #47275
Relates to #53488