Refactoring retry policy

Author: spfink

core/src/it/java/software/amazon/awssdk/core/http/AmazonHttpClientSslHandshakeTimeoutIntegrationTest.java

@@ -25,7 +25,7 @@
 import software.amazon.awssdk.core.AmazonClientException;
 import software.amazon.awssdk.core.internal.http.request.EmptyHttpRequest;
 import software.amazon.awssdk.core.internal.http.response.NullErrorResponseHandler;
-import software.amazon.awssdk.core.retry.PredefinedRetryPolicies;
+import software.amazon.awssdk.core.retry.RetryPolicy;
 import software.amazon.awssdk.http.apache.ApacheSdkHttpClientFactory;
 import utils.HttpTestUtils;
 
@@ -44,7 +44,7 @@ public class AmazonHttpClientSslHandshakeTimeoutIntegrationTest extends Unrespon
     public void testSslHandshakeTimeout() {
         AmazonHttpClient httpClient = HttpTestUtils.testClientBuilder()
                                                    .clientExecutionTimeout(null)
-                                                   .retryPolicy(PredefinedRetryPolicies.NO_RETRY_POLICY)
+                                                   .retryPolicy(RetryPolicy.NONE)
                                                    .httpClient(ApacheSdkHttpClientFactory.builder()
                                                                                          .socketTimeout(CLIENT_SOCKET_TO)
                                                                                          .build()

core/src/it/java/software/amazon/awssdk/core/http/ConnectionPoolMaxConnectionsIntegrationTest.java

@@ -28,7 +28,7 @@
 import software.amazon.awssdk.core.http.server.MockServer;
 import software.amazon.awssdk.core.internal.http.request.EmptyHttpRequest;
 import software.amazon.awssdk.core.internal.http.response.EmptyAWSResponseHandler;
-import software.amazon.awssdk.core.retry.PredefinedRetryPolicies;
+import software.amazon.awssdk.core.retry.RetryPolicy;
 import software.amazon.awssdk.http.apache.ApacheSdkHttpClientFactory;
 import utils.HttpTestUtils;
 
@@ -56,7 +56,7 @@ public void leasing_a_new_connection_fails_with_connection_pool_timeout() throws
 
         AmazonHttpClient httpClient = HttpTestUtils.testClientBuilder()
                                                    .clientExecutionTimeout(null)
-                                                   .retryPolicy(PredefinedRetryPolicies.NO_RETRY_POLICY)
+                                                   .retryPolicy(RetryPolicy.NONE)
                                                    .httpClient(ApacheSdkHttpClientFactory.builder()
                                                                                          .connectionTimeout(
                                                                                                  Duration.ofMillis(100))

core/src/it/java/software/amazon/awssdk/core/http/timers/client/UnresponsiveServerIntegrationTests.java

@@ -40,9 +40,7 @@
 import software.amazon.awssdk.core.http.exception.ClientExecutionTimeoutException;
 import software.amazon.awssdk.core.internal.http.timers.TimeoutTestConstants;
 import software.amazon.awssdk.core.retry.FixedTimeBackoffStrategy;
-import software.amazon.awssdk.core.retry.PredefinedRetryPolicies;
 import software.amazon.awssdk.core.retry.RetryPolicy;
-import software.amazon.awssdk.core.retry.RetryPolicyAdapter;
 import software.amazon.awssdk.http.SdkHttpClient;
 import software.amazon.awssdk.http.apache.ApacheSdkHttpClientFactory;
 import utils.HttpTestUtils;
@@ -85,10 +83,10 @@ public void clientExecutionTimeoutDisabled_SocketTimeoutExceptionIsThrown_NoThre
     public void interruptCausedBySomethingOtherThanTimer_PropagatesInterruptToCaller() {
         Duration socketTimeout = Duration.ofMillis(100);
 
-        RetryPolicyAdapter retryPolicy = new RetryPolicyAdapter(
-                new RetryPolicy(PredefinedRetryPolicies.DEFAULT_RETRY_CONDITION,
-                                new FixedTimeBackoffStrategy(CLIENT_EXECUTION_TIMEOUT.toMillis()),
-                                1, false));
+        RetryPolicy retryPolicy = RetryPolicy.builder()
+                                             .backoffStrategy(new FixedTimeBackoffStrategy(CLIENT_EXECUTION_TIMEOUT))
+                                             .numRetries(1)
+                                             .build();
 
         ClientOverrideConfiguration overrideConfiguration =
                 ClientOverrideConfiguration.builder()

core/src/main/java/software/amazon/awssdk/core/config/ClientOverrideConfiguration.java

@@ -23,7 +23,7 @@
 import java.util.Map;
 import software.amazon.awssdk.annotations.ReviewBeforeRelease;
 import software.amazon.awssdk.core.interceptor.ExecutionInterceptor;
-import software.amazon.awssdk.core.retry.v2.RetryPolicy;
+import software.amazon.awssdk.core.retry.RetryPolicy;
 import software.amazon.awssdk.utils.AttributeMap;
 import software.amazon.awssdk.utils.CollectionUtils;
 import software.amazon.awssdk.utils.builder.CopyableBuilder;

core/src/main/java/software/amazon/awssdk/core/config/defaults/DynamoDbClientConfigurationDefaults.java

@@ -25,11 +25,11 @@
 import java.util.concurrent.ScheduledExecutorService;
 import software.amazon.awssdk.annotations.ReviewBeforeRelease;
 import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.core.config.ClientConfiguration;
 import software.amazon.awssdk.core.config.ClientOverrideConfiguration;
 import software.amazon.awssdk.core.interceptor.ClasspathInterceptorChainFactory;
 import software.amazon.awssdk.core.interceptor.ExecutionInterceptor;
-import software.amazon.awssdk.core.retry.PredefinedRetryPolicies;
-import software.amazon.awssdk.core.retry.RetryPolicyAdapter;
+import software.amazon.awssdk.core.retry.RetryPolicy;
 import software.amazon.awssdk.core.util.UserAgentUtils;
 
 /**
@@ -54,8 +54,7 @@ protected void applyOverrideDefaults(ClientOverrideConfiguration.Builder builder
         builder.advancedOption(CRC32_FROM_COMPRESSED_DATA_ENABLED,
                                applyDefault(configuration.advancedOption(CRC32_FROM_COMPRESSED_DATA_ENABLED), () -> false));
 
-        builder.retryPolicy(applyDefault(configuration.retryPolicy(), () ->
-                new RetryPolicyAdapter(PredefinedRetryPolicies.DEFAULT)));
+        builder.retryPolicy(applyDefault(configuration.retryPolicy(), () -> RetryPolicy.DEFAULT));
 
         // Put global interceptors before the ones currently configured.
         List<ExecutionInterceptor> globalInterceptors = new ClasspathInterceptorChainFactory().getGlobalInterceptors();

core/src/main/java/software/amazon/awssdk/core/config/defaults/GlobalClientConfigurationDefaults.java

@@ -20,6 +20,7 @@
 import java.util.concurrent.CompletableFuture;
 import software.amazon.awssdk.annotations.SdkInternalApi;
 import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.core.Request;
 import software.amazon.awssdk.core.RequestConfig;
 import software.amazon.awssdk.core.RequestExecutionContext;
 import software.amazon.awssdk.core.SdkBaseException;
@@ -42,7 +43,7 @@
 import software.amazon.awssdk.core.http.pipeline.stages.SigningStage;
 import software.amazon.awssdk.core.http.pipeline.stages.UnwrapResponseContainer;
 import software.amazon.awssdk.core.internal.http.timers.client.ClientExecutionTimer;
-import software.amazon.awssdk.core.retry.v2.RetryPolicy;
+import software.amazon.awssdk.core.retry.SdkDefaultRetrySettings;
 import software.amazon.awssdk.core.util.CapacityManager;
 import software.amazon.awssdk.http.SdkHttpFullRequest;
 import software.amazon.awssdk.http.async.SdkHttpRequestProvider;
@@ -65,7 +66,7 @@ public AmazonAsyncHttpClient(AsyncClientConfiguration configuration) {
     private CapacityManager createCapacityManager() {
         // When enabled, total retry capacity is computed based on retry cost and desired number of retries.
         // TODO: Allow customers to configure throttled retries (https://github.com/aws/aws-sdk-java-v2/issues/17)
-        return new CapacityManager(RetryPolicy.THROTTLED_RETRY_COST * RetryPolicy.THROTTLED_RETRIES);
+        return new CapacityManager(SdkDefaultRetrySettings.RETRY_THROTTLING_COST * SdkDefaultRetrySettings.THROTTLED_RETRIES);
     }
 
     /**

core/src/main/java/software/amazon/awssdk/core/http/AmazonAsyncHttpClient.java

@@ -56,7 +56,7 @@
 import software.amazon.awssdk.core.internal.http.response.AwsErrorResponseHandler;
 import software.amazon.awssdk.core.internal.http.response.AwsResponseHandlerAdapter;
 import software.amazon.awssdk.core.internal.http.timers.client.ClientExecutionTimer;
-import software.amazon.awssdk.core.retry.v2.RetryPolicy;
+import software.amazon.awssdk.core.retry.SdkDefaultRetrySettings;
 import software.amazon.awssdk.core.util.CapacityManager;
 import software.amazon.awssdk.http.SdkHttpFullRequest;
 import software.amazon.awssdk.utils.SdkAutoCloseable;
@@ -82,7 +82,7 @@ public AmazonHttpClient(SyncClientConfiguration syncClientConfiguration) {
     private CapacityManager createCapacityManager() {
         // When enabled, total retry capacity is computed based on retry cost and desired number of retries.
         // TODO: Allow customers to configure throttled retries (https://github.com/aws/aws-sdk-java-v2/issues/17)
-        return new CapacityManager(RetryPolicy.THROTTLED_RETRY_COST * RetryPolicy.THROTTLED_RETRIES);
+        return new CapacityManager(SdkDefaultRetrySettings.RETRY_THROTTLING_COST * SdkDefaultRetrySettings.THROTTLED_RETRIES);
     }
 
     /**

core/src/main/java/software/amazon/awssdk/core/http/AmazonHttpClient.java

@@ -19,6 +19,7 @@
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.time.Duration;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
@@ -36,8 +37,8 @@
 import software.amazon.awssdk.core.http.HttpClientDependencies;
 import software.amazon.awssdk.core.http.pipeline.RequestPipeline;
 import software.amazon.awssdk.core.retry.RetryHandler;
+import software.amazon.awssdk.core.retry.RetryPolicy;
 import software.amazon.awssdk.core.retry.RetryUtils;
-import software.amazon.awssdk.core.retry.v2.RetryPolicy;
 import software.amazon.awssdk.core.util.CapacityManager;
 import software.amazon.awssdk.core.util.ClockSkewUtil;
 import software.amazon.awssdk.http.SdkHttpFullRequest;
@@ -138,7 +139,7 @@ private Void handle(CompletableFuture<Response<OutputT>> future,
         private void executeRetry(CompletableFuture<Response<OutputT>> future) {
             publishProgress(progressListener, ProgressEventType.CLIENT_REQUEST_RETRY_EVENT);
             final int retriesAttempted = requestCount - 2;
-            long delay = retryHandler.computeDelayBeforeNextRetry();
+            Duration delay = retryHandler.computeDelayBeforeNextRetry();
 
             if (log.isDebugEnabled()) {
                 log.debug("Retryable error detected, will retry in " + delay + "ms, attempt number: " +
@@ -147,7 +148,7 @@ private void executeRetry(CompletableFuture<Response<OutputT>> future) {
             retrySubmitter.schedule(() -> {
                 execute(future);
                 return null;
-            }, delay, TimeUnit.MILLISECONDS);
+            }, delay.toMillis(), TimeUnit.MILLISECONDS);
         }
 
         private void beforeExecute() {

core/src/main/java/software/amazon/awssdk/core/http/pipeline/stages/AsyncRetryableStage.java

@@ -19,6 +19,8 @@
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.time.Duration;
+import java.util.concurrent.TimeUnit;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import software.amazon.awssdk.core.AmazonServiceException;
@@ -35,8 +37,8 @@
 import software.amazon.awssdk.core.http.pipeline.RequestPipeline;
 import software.amazon.awssdk.core.http.pipeline.RequestToResponsePipeline;
 import software.amazon.awssdk.core.retry.RetryHandler;
+import software.amazon.awssdk.core.retry.RetryPolicy;
 import software.amazon.awssdk.core.retry.RetryUtils;
-import software.amazon.awssdk.core.retry.v2.RetryPolicy;
 import software.amazon.awssdk.core.util.CapacityManager;
 import software.amazon.awssdk.core.util.ClockSkewUtil;
 import software.amazon.awssdk.http.SdkHttpFullRequest;
@@ -204,12 +206,12 @@ private void pauseBeforeRetry() throws InterruptedException {
          */
         private void doPauseBeforeRetry() throws InterruptedException {
             final int retriesAttempted = requestCount - 2;
-            long delay = retryHandler.computeDelayBeforeNextRetry();
+            Duration delay = retryHandler.computeDelayBeforeNextRetry();
 
             if (log.isDebugEnabled()) {
                 log.debug("Retriable error detected, " + "will retry in " + delay + "ms, attempt number: " + retriesAttempted);
             }
-            Thread.sleep(delay);
+            TimeUnit.MILLISECONDS.sleep(delay.toMillis());
         }
     }
 }