Fix BlobStoreRepositoryCleanupIT Leaking Futures #69446
Merged
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
The problem with elastic#69434 was that during master failover the listener might get retried after the new master has already dropped the cleanup from the cluster state which then conflicts with the cleanup executed by the repo consistency checks after each test. To prevent running into this conflict, just wait for the future to actually return. Closes elastic#69434
original-brownbear
added
>test
elasticmachine
added
the
Team:Distributed (Obsolete)
|
Pinging @elastic/es-distributed (Team:Distributed) |
fcofdez
reviewed
Feb 24, 2021
| @@ -80,13 +90,16 @@ private String startBlockedCleanup(String repoName) throws Exception { | |||
| blockMasterFromFinalizingSnapshotOnIndexFile(repoName); | |||
|
|
|||
| logger.info("--> starting repository cleanup"); | |||
| client().admin().cluster().prepareCleanupRepository(repoName).execute(); | |||
| // not running from a non-master client because shutting down a master while a request to it is pending might result in the future | |||
fcofdez
reviewed
Feb 24, 2021
| try { | ||
| cleanupFuture.get(); | ||
| } catch (ExecutionException e) { | ||
| // ignored and expected |
There was a problem hiding this comment.
Can't we be more specific about the exception that we expect here?
There was a problem hiding this comment.
Yea definitely, sorry for the laziness, made it a proper specific assertion now :)
|
Thanks @fcofdez all fixed now I think :) |
|
Thanks Francisco! |
original-brownbear
added a commit
to original-brownbear/elasticsearch
that referenced
this pull request
Feb 24, 2021
The problem with elastic#69434 was that during master failover the listener might get retried after the new master has already dropped the cleanup from the cluster state which then conflicts with the cleanup executed by the repo consistency checks after each test. To prevent running into this conflict, just wait for the future to actually return. Closes elastic#69434
original-brownbear
added a commit
to original-brownbear/elasticsearch
that referenced
this pull request
Feb 24, 2021
The problem with elastic#69434 was that during master failover the listener might get retried after the new master has already dropped the cleanup from the cluster state which then conflicts with the cleanup executed by the repo consistency checks after each test. To prevent running into this conflict, just wait for the future to actually return. Closes elastic#69434
original-brownbear
added a commit
that referenced
this pull request
Feb 24, 2021
The problem with #69434 was that during master failover the listener might get retried after the new master has already dropped the cleanup from the cluster state which then conflicts with the cleanup executed by the repo consistency checks after each test. To prevent running into this conflict, just wait for the future to actually return. Closes #69434
original-brownbear
added a commit
that referenced
this pull request
Feb 24, 2021
The problem with #69434 was that during master failover the listener might get retried after the new master has already dropped the cleanup from the cluster state which then conflicts with the cleanup executed by the repo consistency checks after each test. To prevent running into this conflict, just wait for the future to actually return. Closes #69434
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.
The problem with #69434 was that during master failover
the listener might get retried after the new master has
already dropped the cleanup from the cluster state which
then conflicts with the cleanup executed by the repo consistency
checks after each test.
To prevent running into this conflict, just wait for the future
to actually return.
Closes #69434