Refactor registerRepository method #108788
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
elasticsearchmachine
added
v8.15.0
needs:triage
mhl-b
added
>non-issue
:Distributed/Snapshot/Restore
|
Pinging @elastic/es-distributed (Team:Distributed) |
DaveCTurner
reviewed
May 17, 2024
Comment on lines
164
to
167
| .<Void>newForked(validationStep -> { | ||
| validateRepositoryCanBeCreated(request); | ||
| validationStep.onResponse(null); | ||
| }) |
There was a problem hiding this comment.
Technically unnecessary, but using ActionListener.completeWith makes it more obvious to the casual reader that this listener is always completed:
Suggested change
| .<Void>newForked(validationStep -> { | |
| validateRepositoryCanBeCreated(request); | |
| validationStep.onResponse(null); | |
| }) | |
| .<Void>newForked(validationStep -> ActionListener.completeWith(validationStep, () -> { | |
| validateRepositoryCanBeCreated(request); | |
| return null; | |
| })) |
Comment on lines
204
to
208
| publicationStep.addListener(clusterUpdateStep.delegateFailureAndWrap((ignored1, changed) -> { | ||
| acknowledgementStep.addListener(clusterUpdateStep.delegateFailureAndWrap((ignored2, ack) -> { | ||
| clusterUpdateStep.onResponse(new RegisterRepositoryTaskResult(ack, changed)); | ||
| })); | ||
| })); |
There was a problem hiding this comment.
Best not to capture the listener in the lambdas (probably doesn't matter here, we're capturing other things, but still good practice). Also delegateFailure(onResponse(...)) is just map(...) (the AndWrap bit shouldn't matter here).
Suggested change
| publicationStep.addListener(clusterUpdateStep.delegateFailureAndWrap((ignored1, changed) -> { | |
| acknowledgementStep.addListener(clusterUpdateStep.delegateFailureAndWrap((ignored2, ack) -> { | |
| clusterUpdateStep.onResponse(new RegisterRepositoryTaskResult(ack, changed)); | |
| })); | |
| })); | |
| publicationStep.addListener( | |
| clusterUpdateStep.delegateFailureAndWrap( | |
| (clusterUpdateStep1, changed) -> acknowledgementStep.addListener( | |
| clusterUpdateStep1.map(ack -> new RegisterRepositoryTaskResult(ack, changed)) | |
| ) | |
| ) | |
| ); |
server/src/main/java/org/elasticsearch/repositories/RepositoriesService.java
Show resolved
Hide resolved
| } | ||
| }) | ||
| // When verification has completed, get the repository data for the first time | ||
| .<RepositoryData>andThen((getRepositoryDataStep, ignored) -> { |
There was a problem hiding this comment.
Nit: unnecessary {...} block, this can just be an expression lambda.
Suggested change
| .<RepositoryData>andThen((getRepositoryDataStep, ignored) -> { | |
| .<RepositoryData>andThen((getRepositoryDataStep, ignored) -> |
| ); | ||
| }) | ||
| // When the repository metadata is ready, update the repository UUID stored in the cluster state, if available | ||
| .<Void>andThen((updateRepoUuidStep, repositoryData) -> { |
There was a problem hiding this comment.
Nit: unnecessary {...} block, this can just be an expression lambda.
Suggested change
| .<Void>andThen((updateRepoUuidStep, repositoryData) -> { | |
| .<Void>andThen((updateRepoUuidStep, repositoryData) -> |
|
@DaveCTurner thank you for suggestions. Updated PR except verify condition. |
mhl-b
added
the
auto-merge
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 PR is a syntactic change for
registerRepositoryinRepositoriesService.I use
SubscribableListenerto display order of events and reduce boilerplatecode around failures delegation
listener.delegateFailureAndWrap.It's a part of larger change for verification logic, which should take advantage
of this "sequential" version of code. #108531