Fixed the issue in S3 multipart client where the list of parts could … #4998
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
zoewangg
commented
Mar 7, 2024
| @@ -94,7 +94,7 @@ public String uploadId() { | |||
| } | |||
|
|
|||
| public Map<Integer, CompletedPart> existingParts() { | |||
| return existingParts != null ? Collections.unmodifiableMap(existingParts) : null; | |||
There was a problem hiding this comment.
I removed this since this seems a bit overkill for an internal API.
| @@ -193,15 +199,16 @@ public void onComplete() { | |||
| } | |||
|
|
|||
| private void completeMultipartUploadIfFinished(int requestsInFlight) { | |||
| if (isDone && requestsInFlight == 0) { | |||
| if (isDone && requestsInFlight == 0 && completedMultipartInitiated.compareAndSet(false, true)) { | |||
There was a problem hiding this comment.
Added back this check. It was removed as part of the refactoring for some reason.
zoewangg
commented
Mar 7, 2024
Comment on lines
-203
to
-204
| } else { | ||
| parts = existingParts.values().toArray(new CompletedPart[0]); |
There was a problem hiding this comment.
This else block is not needed since mergeCompletedParts should handle it
…be out of order in the CompleteMultipartRequest, causing "The list of parts was not in ascending order" error to be thrown.
zoewangg
force-pushed
the
zoewang/fixMultipartUpload
branch
from
6b63903 to
60fa08d
Compare
cenedhryn
approved these changes
Mar 7, 2024
|
akidambisrinivasan
pushed a commit
to akidambisrinivasan/aws-sdk-java-v2
that referenced
this pull request
Jun 28, 2024
…be out of order in the CompleteMultipartRequest, causing "The list of parts was not in ascending order" error to be thrown. (aws#4998)
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.
…
Motivation and Context
Fixed the issue in S3 multipart client where the list of parts could be out of order in
CompleteMultipartRequest, causingThe list of parts was not in ascending ordererror to be thrown.This was a regression introduced in #4908. The root cause is that the type of
completedPartswas changed fromAtomicReferenceArraytoConcurrentHashMap, which is not sorted when the SDK sends the request.Modifications
AtomicReferenceArraysince it should provide better performance than ConcurrentHashMapTesting
Added unit tests
Screenshots (if appropriate)
Types of changes
Checklist
mvn installsucceedsscripts/new-changescript and following the instructions. Commit the new file created by the script in.changes/next-releasewith your changes.License