Fixing rollup state tests after onFailure ordering change #45784
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
benwtrent
added
>test
|
Pinging @elastic/es-analytics-geo |
|
I ran locally with this change 10k+ times and it never failed. Without this change I would get periodic failures (matching the closed issue). |
jakelandis
reviewed
Aug 21, 2019
| @@ -946,10 +956,11 @@ protected void doNextBulk(BulkRequest request, ActionListener<BulkResponse> next | |||
| assertTrue(indexer.maybeTriggerAsyncJob(System.currentTimeMillis())); | |||
| assertThat(indexer.getState(), equalTo(IndexerState.INDEXING)); | |||
| latch.countDown(); | |||
| assertBusy(() -> assertTrue(isFinished.get())); | |||
| ESTestCase.awaitBusy(() -> isFinished.get()); | |||
There was a problem hiding this comment.
nitpick: I think this awaitBusy can be removed. If the assertBusy above passes, this will always pass (unless there is some async condition that can change back to false). If the assertBusy fails if will fail the test and this line wont execute.
There was a problem hiding this comment.
You are correct! Let me fix it up really quick.
polyfractal
approved these changes
Aug 21, 2019
benwtrent
added a commit
to benwtrent/elasticsearch
that referenced
this pull request
Aug 21, 2019
) After the PR elastic#45676 onFailure is now called before the indexer state has transitioned out of indexing. To fix these tests, I added a new check to make sure that we don't mark it as failed until AFTER doSaveState is called with a STARTED indexer.
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.
After the PR #45676
onFailureis now called before the indexer state has transitioned out of indexing.To fix these tests, I added a new check to make sure that we don't mark it as failed until AFTER doSaveState is called with a
STARTEDindexer.Sorry for missing these test changes in the earlier PR.
closes #45770