Use 25 ms base delay for DynamoDB in standard retry mode. (aws#2709)

Author: millems

services/dynamodb/src/main/java/software/amazon/awssdk/services/dynamodb/DynamoDbRetryPolicy.java

@@ -34,30 +34,23 @@
 final class DynamoDbRetryPolicy {
 
     /**
-     * Default max retry count for DynamoDB client, when using the LEGACY retry mode.
+     * Default max retry count for DynamoDB client, regardless of retry mode.
      **/
-    private static final int LEGACY_MAX_ERROR_RETRY = 8;
+    private static final int MAX_ERROR_RETRY = 8;
 
     /**
-     * Default max retry count for DynamoDB client, when using the STANDARD retry mode.
+     * Default base sleep time for DynamoDB, regardless of retry mode.
      **/
-    private static final int STANDARD_MAX_ERROR_RETRY = LEGACY_MAX_ERROR_RETRY;
-
-    /**
-     * Default base sleep time for DynamoDB, when using the LEGACY retry mode.
-     **/
-    private static final Duration LEGACY_BASE_DELAY = Duration.ofMillis(25);
+    private static final Duration BASE_DELAY = Duration.ofMillis(25);
 
     /**
      * The default back-off strategy for DynamoDB client, which increases
      * exponentially up to a max amount of delay. Compared to the SDK default
      * back-off strategy, it applies a smaller scale factor.
-     *
-     * This is only used when using the LEGACY retry mode.
      */
-    private static final BackoffStrategy LEGACY_BACKOFF_STRATEGY =
+    private static final BackoffStrategy BACKOFF_STRATEGY =
         FullJitterBackoffStrategy.builder()
-                                 .baseDelay(LEGACY_BASE_DELAY)
+                                 .baseDelay(BASE_DELAY)
                                  .maxBackoffTime(SdkDefaultRetrySetting.MAX_BACKOFF)
                                  .build();
 
@@ -76,22 +69,11 @@ public static RetryPolicy resolveRetryPolicy(SdkClientConfiguration config) {
                                        .defaultRetryMode(config.option(SdkClientOption.DEFAULT_RETRY_MODE))
                                        .resolve();
 
-        switch (retryMode) {
-            case LEGACY:
-                return AwsRetryPolicy.forRetryMode(RetryMode.LEGACY)
-                        .toBuilder()
-                        .additionalRetryConditionsAllowed(false)
-                        .numRetries(LEGACY_MAX_ERROR_RETRY)
-                        .backoffStrategy(LEGACY_BACKOFF_STRATEGY)
-                        .build();
-            case STANDARD:
-                return AwsRetryPolicy.forRetryMode(retryMode)
-                        .toBuilder()
-                        .additionalRetryConditionsAllowed(false)
-                        .numRetries(STANDARD_MAX_ERROR_RETRY)
-                        .build();
-            default:
-                throw new IllegalArgumentException("Unknown retry mode: " + retryMode);
-        }
+        return AwsRetryPolicy.forRetryMode(retryMode)
+                             .toBuilder()
+                             .additionalRetryConditionsAllowed(false)
+                             .numRetries(MAX_ERROR_RETRY)
+                             .backoffStrategy(BACKOFF_STRATEGY)
+                             .build();
     }
 }

services/dynamodb/src/test/java/software/amazon/awssdk/services/dynamodb/DynamoDbRetryPolicyTest.java

@@ -1,35 +1,58 @@
 package software.amazon.awssdk.services.dynamodb;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.time.Duration;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 import software.amazon.awssdk.core.SdkSystemSetting;
 import software.amazon.awssdk.core.client.config.SdkClientConfiguration;
 import software.amazon.awssdk.core.retry.RetryPolicy;
-import software.amazon.awssdk.profiles.ProfileFileSystemSetting;
+import software.amazon.awssdk.core.retry.backoff.BackoffStrategy;
+import software.amazon.awssdk.core.retry.backoff.FullJitterBackoffStrategy;
 import software.amazon.awssdk.testutils.EnvironmentVariableHelper;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 public class DynamoDbRetryPolicyTest {
 
-    private static final EnvironmentVariableHelper ENVIRONMENT_VARIABLE_HELPER = new EnvironmentVariableHelper();
+    private EnvironmentVariableHelper environmentVariableHelper;
+
+    @Before
+    public void setup() {
+        environmentVariableHelper = new EnvironmentVariableHelper();
+    }
+
+    @After
+    public void reset() {
+        environmentVariableHelper.reset();
+    }
 
     @Test
     public void test_numRetries_with_standardRetryPolicy() {
-        ENVIRONMENT_VARIABLE_HELPER.set(SdkSystemSetting.AWS_RETRY_MODE.environmentVariable(), "standard");
-        System.setProperty(ProfileFileSystemSetting.AWS_PROFILE.property(), "default");
+        environmentVariableHelper.set(SdkSystemSetting.AWS_RETRY_MODE.environmentVariable(), "standard");
         final SdkClientConfiguration sdkClientConfiguration = SdkClientConfiguration.builder().build();
         final RetryPolicy retryPolicy = DynamoDbRetryPolicy.resolveRetryPolicy(sdkClientConfiguration);
         assertThat(retryPolicy.numRetries()).isEqualTo(8);
     }
 
     @Test
     public void test_numRetries_with_legacyRetryPolicy() {
-        ENVIRONMENT_VARIABLE_HELPER.set(SdkSystemSetting.AWS_RETRY_MODE.environmentVariable(), "legacy");
-        System.setProperty(ProfileFileSystemSetting.AWS_PROFILE.property(), "default");
+        environmentVariableHelper.set(SdkSystemSetting.AWS_RETRY_MODE.environmentVariable(), "legacy");
         final SdkClientConfiguration sdkClientConfiguration = SdkClientConfiguration.builder().build();
         final RetryPolicy retryPolicy = DynamoDbRetryPolicy.resolveRetryPolicy(sdkClientConfiguration);
         assertThat(retryPolicy.numRetries()).isEqualTo(8);
     }
 
+    @Test
+    public void test_backoffBaseDelay_with_standardRetryPolicy() {
+        environmentVariableHelper.set(SdkSystemSetting.AWS_RETRY_MODE.environmentVariable(), "standard");
+        SdkClientConfiguration sdkClientConfiguration = SdkClientConfiguration.builder().build();
+        RetryPolicy retryPolicy = DynamoDbRetryPolicy.resolveRetryPolicy(sdkClientConfiguration);
+        BackoffStrategy backoffStrategy = retryPolicy.backoffStrategy();
+
+        assertThat(backoffStrategy).isInstanceOfSatisfying(FullJitterBackoffStrategy.class, fjbs -> {
+            assertThat(fjbs.toBuilder().baseDelay()).isEqualTo(Duration.ofMillis(25));
+        });
+    }
 
 }