Skip to content

Commit 84c383b

Browse files
committed
set timeout to 30 sec for uploads
1 parent 69241e4 commit 84c383b

File tree

4 files changed

+20
-8
lines changed

4 files changed

+20
-8
lines changed

test/s3-tests/src/it/java/software/amazon/awssdk/services/s3/regression/upload/UploadAsyncRegressionTesting.java

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
import static software.amazon.awssdk.services.s3.regression.S3ChecksumsTestUtils.assumeNotAccessPointWithPathStyle;
2020
import static software.amazon.awssdk.services.s3.regression.S3ClientFlavor.STANDARD_ASYNC;
2121

22+
import java.time.Duration;
23+
import java.time.temporal.ChronoUnit;
2224
import java.util.List;
2325
import java.util.Optional;
2426
import java.util.concurrent.TimeUnit;
@@ -60,14 +62,14 @@ void putObject(FlattenUploadConfig config) throws Exception {
6062
// Payload signing doesn't work correctly for async java based
6163
// TODO(sra-identity-auth) remove when chunked encoding support is added in async code path
6264
Assumptions.assumeFalse(config.isPayloadSigning()
63-
// MRAP requires body signing
64-
|| config.getBucketType() == BucketType.MRAP,
65-
"Async payload signing doesn't work with Java based clients");
65+
// MRAP requires body signing
66+
|| config.getBucketType() == BucketType.MRAP,
67+
"Async payload signing doesn't work with Java based clients");
6668

6769
// For testing purposes, ContentProvider is Publisher<ByteBuffer> for async clients
6870
// Async java based clients don't currently support unknown content-length bodies
6971
Assumptions.assumeFalse(config.getBodyType() == BodyType.CONTENT_PROVIDER_NO_LENGTH,
70-
"Async Java based support unknown content length");
72+
"Async Java based support unknown content length");
7173

7274
LOG.info(() -> "Running UploadAsyncRegressionTesting putObject with config: " + config);
7375

@@ -86,7 +88,8 @@ void putObject(FlattenUploadConfig config) throws Exception {
8688

8789
ClientOverrideConfiguration.Builder overrideConfiguration =
8890
ClientOverrideConfiguration.builder()
89-
.addExecutionInterceptor(recorder);
91+
.addExecutionInterceptor(recorder)
92+
.apiCallTimeout(Duration.of(30, ChronoUnit.SECONDS));
9093

9194
if (config.isPayloadSigning()) {
9295
overrideConfiguration.addExecutionInterceptor(new EnablePayloadSigningInterceptor());

test/s3-tests/src/it/java/software/amazon/awssdk/services/s3/regression/upload/UploadCrtRegressionTesting.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
import static software.amazon.awssdk.services.s3.regression.S3ChecksumsTestUtils.assumeNotAccessPointWithPathStyle;
2020
import static software.amazon.awssdk.services.s3.regression.S3ClientFlavor.CRT_BASED;
2121

22+
import java.time.Duration;
23+
import java.time.temporal.ChronoUnit;
2224
import java.util.List;
2325
import java.util.concurrent.TimeUnit;
2426
import org.junit.jupiter.api.Assumptions;
@@ -66,7 +68,8 @@ void putObject(FlattenUploadConfig config) throws Exception {
6668

6769
ClientOverrideConfiguration.Builder overrideConfiguration =
6870
ClientOverrideConfiguration.builder()
69-
.addExecutionInterceptor(recorder);
71+
.addExecutionInterceptor(recorder)
72+
.apiCallTimeout(Duration.of(30, ChronoUnit.SECONDS));
7073

7174
if (config.isPayloadSigning()) {
7275
overrideConfiguration.addExecutionInterceptor(new EnablePayloadSigningInterceptor());

test/s3-tests/src/it/java/software/amazon/awssdk/services/s3/regression/upload/UploadSyncRegressionTesting.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
import static org.assertj.core.api.Assertions.assertThat;
1919
import static software.amazon.awssdk.services.s3.regression.S3ChecksumsTestUtils.assumeNotAccessPointWithPathStyle;
2020

21+
import java.time.Duration;
22+
import java.time.temporal.ChronoUnit;
2123
import java.util.List;
2224
import java.util.Optional;
2325
import java.util.concurrent.TimeUnit;
@@ -65,7 +67,8 @@ void putObject(FlattenUploadConfig config) throws Exception {
6567

6668
ClientOverrideConfiguration.Builder overrideConfiguration =
6769
ClientOverrideConfiguration.builder()
68-
.addExecutionInterceptor(recorder);
70+
.addExecutionInterceptor(recorder)
71+
.apiCallTimeout(Duration.of(30, ChronoUnit.SECONDS));
6972

7073
if (config.isPayloadSigning()) {
7174
overrideConfiguration.addExecutionInterceptor(new EnablePayloadSigningInterceptor());

test/s3-tests/src/it/java/software/amazon/awssdk/services/s3/regression/upload/UploadTransferManagerRegressionTesting.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
import static software.amazon.awssdk.services.s3.regression.S3ChecksumsTestUtils.assumeNotAccessPointWithPathStyle;
1919
import static software.amazon.awssdk.services.s3.regression.S3ClientFlavor.MULTIPART_ENABLED;
2020

21+
import java.time.Duration;
22+
import java.time.temporal.ChronoUnit;
2123
import java.util.List;
2224
import java.util.concurrent.TimeUnit;
2325
import org.junit.jupiter.api.Assumptions;
@@ -78,7 +80,8 @@ void putObject(FlattenUploadConfig config) throws Exception {
7880

7981
ClientOverrideConfiguration.Builder overrideConfiguration =
8082
ClientOverrideConfiguration.builder()
81-
.addExecutionInterceptor(recorder);
83+
.addExecutionInterceptor(recorder)
84+
.apiCallTimeout(Duration.of(30, ChronoUnit.SECONDS));
8285

8386
if (config.isPayloadSigning()) {
8487
overrideConfiguration.addExecutionInterceptor(new EnablePayloadSigningInterceptor());

0 commit comments

Comments
 (0)