Skip to content

Fix failing s3 regression tests for MRAP #6646

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

Merged
alextwoods merged 4 commits into from
Dec 24, 2025
Merged

Fix failing s3 regression tests for MRAP #6646

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3b508b3
Fix failing s3 regression tests for MRAP
alextwoods Dec 24, 2025
def6671
Merge branch 'master' into alexwoo/fix_s3_regression_mrap
alextwoods Dec 24, 2025
7f1fe5b
Add retry on async putObject to handle flaky MRAP disconnects
alextwoods Dec 24, 2025
1646b2e
Merge branch 'alexwoo/fix_s3_regression_mrap' of github.com:aws/aws-s…
alextwoods Dec 24, 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
5 changes: 5 additions & 0 deletions ...tests/src/it/java/software/amazon/awssdk/services/s3/regression/S3ChecksumsTestUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,11 @@ public static void assumeNotAccessPointWithPathStyle(UploadConfig config) {
"Path style doesn't work with ARN type buckets");
}

public static void assumeNotMRAP(UploadConfig config) {
Assumptions.assumeFalse(config.getBucketType().equals(BucketType.MRAP),
"MRAP buckets are not supported by TransferManager.");
}

public static String crc32(String s) {
return crc32(s.getBytes(StandardCharsets.UTF_8));
}
Expand Down
5 changes: 3 additions & 2 deletions ...va/software/amazon/awssdk/services/s3/regression/upload/UploadAsyncRegressionTesting.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
import software.amazon.awssdk.services.s3.regression.BucketType;
import software.amazon.awssdk.services.s3.regression.S3ChecksumsTestUtils;
import software.amazon.awssdk.services.s3.regression.TestCallable;
import software.amazon.awssdk.testutils.retry.RetryableTest;
import software.amazon.awssdk.utils.Logger;

public class UploadAsyncRegressionTesting extends UploadStreamingRegressionTesting {
Expand All @@ -49,6 +50,7 @@ public static List<UploadConfig> testConfigs() {
@ParameterizedTest
@MethodSource("testConfigs")
@Timeout(value = 120, unit = TimeUnit.SECONDS)
@RetryableTest(maxRetries = 3)
void putObject(UploadConfig config) throws Exception {
assumeNotAccessPointWithPathStyle(config);

Expand Down Expand Up @@ -79,7 +81,7 @@ void putObject(UploadConfig config) throws Exception {
ClientOverrideConfiguration.Builder overrideConfiguration =
ClientOverrideConfiguration.builder()
.addExecutionInterceptor(recorder)
.apiCallTimeout(Duration.of(30, ChronoUnit.SECONDS));
.apiCallTimeout(Duration.of(90, ChronoUnit.SECONDS));

if (config.isPayloadSigning()) {
overrideConfiguration.addExecutionInterceptor(new EnablePayloadSigningInterceptor());
Expand Down Expand Up @@ -137,5 +139,4 @@ void putObject(UploadConfig config) throws Exception {
}
}
}

}
4 changes: 2 additions & 2 deletions ...e/amazon/awssdk/services/s3/regression/upload/UploadTransferManagerRegressionTesting.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
package software.amazon.awssdk.services.s3.regression.upload;

import static software.amazon.awssdk.services.s3.regression.S3ChecksumsTestUtils.assumeNotAccessPointWithPathStyle;
import static software.amazon.awssdk.services.s3.regression.S3ChecksumsTestUtils.assumeNotMRAP;
import static software.amazon.awssdk.services.s3.regression.S3ClientFlavor.MULTIPART_ENABLED;

import java.time.Duration;
Expand Down Expand Up @@ -48,6 +49,7 @@ public static List<UploadConfig> testConfigs() {
void putObject(UploadConfig config) throws Exception {

assumeNotAccessPointWithPathStyle(config);
assumeNotMRAP(config);

// For testing purposes, ContentProvider is Publisher<ByteBuffer> for async clients
// There is no way to create AsyncRequestBody with a Publisher<ByteBuffer> and also provide the content length
Expand Down Expand Up @@ -99,6 +101,4 @@ void putObject(UploadConfig config) throws Exception {
}
}
}


}
Loading