Expose StandardRetryOptions in the S3CrtClient Interface

Author: joviegas

services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/crt/S3CrtAsyncHttpClient.java

@@ -78,6 +78,9 @@ private S3CrtAsyncHttpClient(Builder builder) {
                                  .withInitialReadWindowSize(initialWindowSize)
                                  .withReadBackpressureEnabled(true);
 
+        if (s3NativeClientConfiguration.standardRetryOptions() != null) {
+            this.s3ClientOptions.withStandardRetryOptions(s3NativeClientConfiguration.standardRetryOptions());
+        }
         Optional.ofNullable(s3NativeClientConfiguration.proxyOptions()).ifPresent(s3ClientOptions::withProxyOptions);
         Optional.ofNullable(s3NativeClientConfiguration.connectionTimeout())
                 .map(Duration::toMillis)

services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/crt/S3NativeClientConfiguration.java

@@ -27,6 +27,7 @@
 import software.amazon.awssdk.crt.http.HttpMonitoringOptions;
 import software.amazon.awssdk.crt.http.HttpProxyOptions;
 import software.amazon.awssdk.crt.io.ClientBootstrap;
+import software.amazon.awssdk.crt.io.StandardRetryOptions;
 import software.amazon.awssdk.crt.io.TlsCipherPreference;
 import software.amazon.awssdk.crt.io.TlsContext;
 import software.amazon.awssdk.crt.io.TlsContextOptions;
@@ -43,6 +44,7 @@ public class S3NativeClientConfiguration implements SdkAutoCloseable {
     private static final long DEFAULT_TARGET_THROUGHPUT_IN_GBPS = 10;
 
     private final String signingRegion;
+    private final StandardRetryOptions standardRetryOptions;
     private final ClientBootstrap clientBootstrap;
     private final CrtCredentialsProviderAdapter credentialProviderAdapter;
     private final CredentialsProvider credentialsProvider;
@@ -97,6 +99,7 @@ public S3NativeClientConfiguration(Builder builder) {
             this.connectionTimeout = null;
             this.httpMonitoringOptions = null;
         }
+        this.standardRetryOptions = builder.standardRetryOptions;
     }
 
     public HttpMonitoringOptions httpMonitoringOptions() {
@@ -140,6 +143,10 @@ public int maxConcurrency() {
         return maxConcurrency;
     }
 
+    public StandardRetryOptions standardRetryOptions() {
+        return standardRetryOptions;
+    }
+
     public URI endpointOverride() {
         return endpointOverride;
     }
@@ -169,6 +176,7 @@ public static final class Builder {
         private URI endpointOverride;
         private Boolean checksumValidationEnabled;
         private S3CrtHttpConfiguration httpConfiguration;
+        private StandardRetryOptions standardRetryOptions;
 
         private Builder() {
         }
@@ -224,5 +232,10 @@ public Builder httpConfiguration(S3CrtHttpConfiguration httpConfiguration) {
             this.httpConfiguration = httpConfiguration;
             return this;
         }
+
+        public Builder standardRetryOptions(StandardRetryOptions standardRetryOptions) {
+            this.standardRetryOptions = standardRetryOptions;
+            return this;
+        }
     }
 }

services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/crt/S3CrtAsyncHttpClientTest.java

@@ -37,6 +37,8 @@
 import org.mockito.Mockito;
 import software.amazon.awssdk.core.interceptor.trait.HttpChecksum;
 import software.amazon.awssdk.crt.http.HttpRequest;
+import software.amazon.awssdk.crt.io.ExponentialBackoffRetryOptions;
+import software.amazon.awssdk.crt.io.StandardRetryOptions;
 import software.amazon.awssdk.crt.s3.ChecksumAlgorithm;
 import software.amazon.awssdk.crt.s3.S3Client;
 import software.amazon.awssdk.crt.s3.S3ClientOptions;
@@ -314,6 +316,9 @@ void build_shouldPassThroughParameters() {
             S3NativeClientConfiguration.builder()
                                        .maxConcurrency(100)
                                        .signingRegion("us-west-2")
+                .standardRetryOptions(
+                    new StandardRetryOptions()
+                        .withBackoffRetryOptions(new ExponentialBackoffRetryOptions().withMaxRetries(7)))
                                        .httpConfiguration(S3CrtHttpConfiguration.builder()
                                                                                 .connectionTimeout(Duration.ofSeconds(1))
                                                                                 .connectionHealthConfiguration(c -> c.minimumThroughputInBps(1024L)
@@ -325,6 +330,7 @@ void build_shouldPassThroughParameters() {
             (S3CrtAsyncHttpClient) S3CrtAsyncHttpClient.builder().s3ClientConfiguration(configuration).build();
         S3ClientOptions clientOptions = client.s3ClientOptions();
         assertThat(clientOptions.getConnectTimeoutMs()).isEqualTo(1000);
+        assertThat(clientOptions.getStandardRetryOptions().getBackoffRetryOptions().getMaxRetries()).isEqualTo(7);
         assertThat(clientOptions.getMaxConnections()).isEqualTo(100);
         assertThat(clientOptions.getMonitoringOptions()).satisfies(options -> {
             assertThat(options.getMinThroughputBytesPerSecond()).isEqualTo(1024);