Skip to content

Add retry #6437

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add retry #6437

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
add089a
Add retry
RanVaknin Sep 22, 2025
9ed1ea2
Remove unused import
RanVaknin Sep 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 29 additions & 22 deletions .../amazon/awssdk/services/s3/internal/multipart/S3MultipartClientPutObjectWiremockTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,29 +177,36 @@ public void subscribe(Subscriber<? super ByteBuffer> s) {
void mpuDefaultSplitImpl_partsFailOfRetryableError_shouldFail(String description,
Long contentLength,
ResponseDefinitionBuilder responseDefinitionBuilder) {
stubUploadPartFailsInitialAttemptSucceedsUponRetryCalls(responseDefinitionBuilder);
List<ByteBuffer> buffers = new ArrayList<>();
buffers.add(SdkBytes.fromUtf8String(RandomStringUtils.randomAscii(10)).asByteBuffer());
buffers.add(SdkBytes.fromUtf8String(RandomStringUtils.randomAscii(10)).asByteBuffer());
AsyncRequestBody asyncRequestBody = new AsyncRequestBody() {
@Override
public Optional<Long> contentLength() {
return Optional.ofNullable(contentLength);
for (int i = 0; i < 3; i++) {
try {
stubUploadPartFailsInitialAttemptSucceedsUponRetryCalls(responseDefinitionBuilder);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: maybe consider put this line out of the for loop to prevent multiple stubs. I'm not sure if this will just overwrite the previous stub or cause multiple stub

List<ByteBuffer> buffers = new ArrayList<>();
buffers.add(SdkBytes.fromUtf8String(RandomStringUtils.randomAscii(10)).asByteBuffer());
buffers.add(SdkBytes.fromUtf8String(RandomStringUtils.randomAscii(10)).asByteBuffer());
AsyncRequestBody asyncRequestBody = new AsyncRequestBody() {
@Override
public Optional<Long> contentLength() {
return Optional.ofNullable(contentLength);
}

@Override
public void subscribe(Subscriber<? super ByteBuffer> s) {
Flowable.fromIterable(buffers).subscribe(s);
}
};

assertThatThrownBy(() -> s3AsyncClient.putObject(b -> b.bucket(BUCKET).key(KEY), asyncRequestBody)
.join())
.hasCauseInstanceOf(NonRetryableException.class)
.hasMessageContaining("Multiple subscribers detected.");

verify(1, putRequestedFor(anyUrl()).withQueryParam("partNumber", matching(String.valueOf(1))));
verify(1, putRequestedFor(anyUrl()).withQueryParam("partNumber", matching(String.valueOf(1))));
return;
} catch (AssertionError e) {
if (i == 2) throw e;
}

@Override
public void subscribe(Subscriber<? super ByteBuffer> s) {
Flowable.fromIterable(buffers).subscribe(s);
}
};

assertThatThrownBy(() -> s3AsyncClient.putObject(b -> b.bucket(BUCKET).key(KEY), asyncRequestBody)
.join())
.hasCauseInstanceOf(NonRetryableException.class)
.hasMessageContaining("Multiple subscribers detected.");

verify(1, putRequestedFor(anyUrl()).withQueryParam("partNumber", matching(String.valueOf(1))));
verify(1, putRequestedFor(anyUrl()).withQueryParam("partNumber", matching(String.valueOf(1))));
}
}


Expand Down
Loading