Remove Blocking on GENERIC Pool in GET Snapshots #69101
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 aligns the way get snapshots works in `7.x` with how it works in `master` exactly (except for masters ability to load snapshots across repos) and thus fixes the deadlock in elastic#69099. Closes elastic#69099
original-brownbear
added
>bug
:Distributed/Snapshot/Restore
|
Pinging @elastic/es-distributed (Team:Distributed) |
|
Jenkins run elasticsearch-ci/1 (snapshot test failure but unrelated and known to the features team) |
DaveCTurner
approved these changes
Feb 17, 2021
There was a problem hiding this comment.
LGTM
I opened #69108 to remind us to do something better with the new response format in 8.0 when we can.
| @@ -170,16 +181,17 @@ protected void masterOperation(final GetSnapshotsRequest request, final ClusterS | |||
| * if false, they will throw an error | |||
| * @return list of snapshots | |||
| */ | |||
| private List<SnapshotInfo> snapshots(@Nullable SnapshotsInProgress snapshotsInProgress, String repositoryName, | |||
| private List<SnapshotInfo> snapshots(SnapshotsInProgress snapshotsInProgress, String repositoryName, | |||
| List<SnapshotId> snapshotIds, boolean ignoreUnavailable) { | |||
There was a problem hiding this comment.
Nit: spurious whitespace deviation from master :)
Suggested change
| List<SnapshotId> snapshotIds, boolean ignoreUnavailable) { | |
| List<SnapshotId> snapshotIds, boolean ignoreUnavailable) { |
There was a problem hiding this comment.
The version here is actually nicer/more correct :D that's why I deviated. I'd rather fix this in master next time a change to the file is made there :)
|
Thanks David! |
original-brownbear
added a commit
to original-brownbear/elasticsearch
that referenced
this pull request
Feb 17, 2021
This aligns the way get snapshots works in `7.x` with how it works in `master` exactly (except for masters ability to load snapshots across repos) and thus fixes the deadlock in elastic#69099. Closes elastic#69099
original-brownbear
added a commit
that referenced
this pull request
Feb 17, 2021
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.
This aligns the way get snapshots works in
7.xwith how it worksin
masterexactly (except for masters ability to load snapshots across repos)and thus fixes the deadlock in #69099.
No need to review the logic in detail here, it's the exact same logic as in master now so it probably rather makes sense comparing with master than looking at this in isolation.
Closes #69099