TESTS: Relax Assertion About Deleting Shard Dir #34120
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
Member
original-brownbear
commented
Sep 27, 2018
original-brownbear
commented
- Allow empty state directory to prevent test from failing
- Closes [CI] IndexRecoveryIT.testRerouteRecovery : Paths exist that should have been deleted #32686
* Allow empty state directory to prevent test from failing * Closes elastic#32686
original-brownbear
added
>test
|
Pinging @elastic/es-distributed |
ywelsch
approved these changes
Sep 28, 2018
| Set<Path> existingPaths = new HashSet<>(); | ||
| for (Path path : paths) { | ||
| if (FileSystemUtils.exists(path)) { | ||
| existingPaths.add(path); | ||
| } | ||
| } | ||
| // Relaxed assertion for the special case where only the empty state directory exists after deleting | ||
| // the shard directory because it was created again as a result of a metadata read action concurrently. | ||
| if (existingPaths.size() == 1) { |
There was a problem hiding this comment.
I wonder if it's easier to move the "check if there's only a left-over MetaDataStateFormat.STATE_DIR_NAME" logic into the if (FileSystemUtils.exists(path)) { condition above. Then you won't have to remove stuff again from existingPaths.
There was a problem hiding this comment.
yea that would save a few lines :) sec adjusting
And 5.6. |
|
@ywelsch applied your suggestion, much nicer this way I think ... with the initial version we would've also lost the logging of the name of the leftover paths. |
|
@ywelsch thanks! |
DaveCTurner
pushed a commit
that referenced
this pull request
Oct 3, 2018
* TESTS: Relax Assertion About Deleting Shard Dir * Allow empty state directory to prevent test from failing * Closes #32686
DaveCTurner
pushed a commit
that referenced
this pull request
Oct 3, 2018
* TESTS: Relax Assertion About Deleting Shard Dir * Allow empty state directory to prevent test from failing * Closes #32686
DaveCTurner
added a commit
to DaveCTurner/elasticsearch
that referenced
this pull request
Oct 3, 2018
* TESTS: Relax Assertion About Deleting Shard Dir * Allow empty state directory to prevent test from failing * Closes elastic#32686 Backport of elastic#34120 and some associated changes. Co-authored-by: Armin Braun <[email protected]>
|
Backport to 5.6 wasn't totally trivial so I opened #34266. |
DaveCTurner
added a commit
that referenced
this pull request
Oct 4, 2018
* TESTS: Relax Assertion About Deleting Shard Dir * Allow empty state directory to prevent test from failing * Closes #32686 Backport of #34120 and some associated changes. Co-authored-by: Armin Braun <[email protected]>
kcm
pushed a commit
that referenced
this pull request
Oct 30, 2018
* TESTS: Relax Assertion About Deleting Shard Dir * Allow empty state directory to prevent test from failing * Closes #32686
original-brownbear
added a commit
to original-brownbear/elasticsearch
that referenced
this pull request
Dec 4, 2018
* Retry loading latest state to deal with concurrent deletes of the state file * Relates elastic#34120 that ran into similar concurrency issues with the state files * Closes elastic#36189
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.