Refactor S3 conditional operations #139265
Open
+115
−40
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
mhl-b
added
>non-issue
:Distributed Coordination/Snapshot/Restore
Collaborator
|
Pinging @elastic/es-distributed-coordination (Team:Distributed Coordination) |
DaveCTurner
reviewed
Dec 9, 2025
Contributor
DaveCTurner
left a comment
DaveCTurner
left a comment
There was a problem hiding this comment.
Production code looks good (one nit) but a couple of concerns about the test changes.
| final boolean failIfAlreadyExists | ||
| final ConditionalOperation condition | ||
| ) throws IOException { | ||
| try (var clientReference = s3BlobStore.clientReference()) { |
Contributor
There was a problem hiding this comment.
We don't need this clientReference if we're going to acquire another one within putObject(...)
Comment on lines
161
to
162
| if (failIfAlreadyExists) { | ||
| assertEquals("*", request.ifNoneMatch()); |
Contributor
There was a problem hiding this comment.
Does this work with the change to randomCondition()?
Comment on lines
375
to
376
| if (failIfAlreadyExists) { | ||
| assertEquals("*", compRequest.ifNoneMatch()); |
Contributor
There was a problem hiding this comment.
Likewise I'm suspicious about this bit with the change to randomCondition().
DaveCTurner
approved these changes
Dec 10, 2025
Contributor
DaveCTurner
left a comment
DaveCTurner
left a comment
There was a problem hiding this comment.
LGTM (I pushed 1bab786 to strengthen the tests slightly)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Add S3 ConditionalOperation enumeration for stronger type-check on mutually exclusive conditions:
None,If-None-Match, andIf-Match. https://docs.aws.amazon.com/AmazonS3/latest/userguide/conditional-requests.html