SOLR-17769: Use S3 RetryStrategy instead of RetryPolicy (#3375)

Author: HoustonPutman

gradle/libs.versions.toml

@@ -225,6 +225,7 @@ amazon-awssdk-bom = { module = "software.amazon.awssdk:bom", version.ref = "amaz
 amazon-awssdk-httpclient-spi = { module = "software.amazon.awssdk:http-client-spi", version.ref = "amazon-awssdk" }
 amazon-awssdk-profiles = { module = "software.amazon.awssdk:profiles", version.ref = "amazon-awssdk" }
 amazon-awssdk-regions = { module = "software.amazon.awssdk:regions", version.ref = "amazon-awssdk" }
+amazon-awssdk-retries-spi = { module = "software.amazon.awssdk:retries-spi", version.ref = "amazon-awssdk" }
 amazon-awssdk-s3 = { module = "software.amazon.awssdk:s3", version.ref = "amazon-awssdk" }
 amazon-awssdk-sdkcore = { module = "software.amazon.awssdk:sdk-core", version.ref = "amazon-awssdk" }
 amazon-awssdk-sts = { module = "software.amazon.awssdk:sts", version.ref = "amazon-awssdk" }

solr/CHANGES.txt

@@ -307,6 +307,8 @@ Bug Fixes
 * SOLR-17754: Fix rare bug in overseer main loop in case of high load, that may cause the overseer be fully stuck until
   server restart. (Pierre Salagnac)
 
+* SOLR-17769: Use S3 RetryStrategy instead of RetryPolicy. This fixes the error caused by using the "Adaptive" retry mode. (Houston Putman)
+
 Dependency Upgrades
 ---------------------
 * SOLR-17471: Upgrade Lucene to 9.12.1. (Pierre Salagnac, Christine Poerschke)

solr/modules/s3-repository/build.gradle

@@ -32,6 +32,7 @@ dependencies {
   implementation libs.amazon.awssdk.awscore
   implementation libs.amazon.awssdk.regions
   implementation libs.amazon.awssdk.httpclient.spi
+  implementation libs.amazon.awssdk.retries.spi
   implementation(libs.amazon.awssdk.s3) {
     exclude group: 'software.amazon.awssdk', module: 'netty-nio-client'
   }

solr/modules/s3-repository/src/java/org/apache/solr/s3/S3StorageClient.java

@@ -38,15 +38,16 @@
 import org.slf4j.LoggerFactory;
 import software.amazon.awssdk.auth.credentials.DefaultCredentialsProvider;
 import software.amazon.awssdk.awscore.exception.AwsServiceException;
+import software.amazon.awssdk.awscore.retry.AwsRetryStrategy;
 import software.amazon.awssdk.core.exception.SdkClientException;
 import software.amazon.awssdk.core.exception.SdkException;
 import software.amazon.awssdk.core.retry.RetryMode;
-import software.amazon.awssdk.core.retry.RetryPolicy;
 import software.amazon.awssdk.core.sync.RequestBody;
 import software.amazon.awssdk.core.sync.ResponseTransformer;
 import software.amazon.awssdk.http.apache.ApacheHttpClient;
 import software.amazon.awssdk.http.apache.ProxyConfiguration;
 import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.retries.api.RetryStrategy;
 import software.amazon.awssdk.services.s3.S3Client;
 import software.amazon.awssdk.services.s3.S3ClientBuilder;
 import software.amazon.awssdk.services.s3.S3Configuration;
@@ -137,23 +138,16 @@ private static S3Client createInternalClient(
     /*
      * Retry logic
      */
-    RetryPolicy retryPolicy;
+    RetryStrategy retryStrategy;
     if (disableRetries) {
-      retryPolicy = RetryPolicy.none();
+      retryStrategy = AwsRetryStrategy.doNotRetry();
     } else {
       RetryMode.Resolver retryModeResolver = RetryMode.resolver();
       if (StrUtils.isNotNullOrEmpty(profile)) {
         retryModeResolver.profileName(profile);
       }
       RetryMode retryMode = retryModeResolver.resolve();
-      RetryPolicy.Builder retryPolicyBuilder = RetryPolicy.builder(retryMode);
-
-      // Do not fail fast on rate limiting
-      if (retryMode == RetryMode.ADAPTIVE) {
-        retryPolicyBuilder.fastFailRateLimiting(false);
-      }
-
-      retryPolicy = retryPolicyBuilder.build();
+      retryStrategy = AwsRetryStrategy.forRetryMode(retryMode);
     }
 
     /*
@@ -171,7 +165,7 @@ private static S3Client createInternalClient(
     S3ClientBuilder clientBuilder =
         S3Client.builder()
             .credentialsProvider(credentialsProviderBuilder.build())
-            .overrideConfiguration(builder -> builder.retryPolicy(retryPolicy))
+            .overrideConfiguration(builder -> builder.retryStrategy(retryStrategy))
             .serviceConfiguration(configBuilder.build())
             .httpClient(sdkHttpClientBuilder.build());
 

solr/modules/s3-repository/src/test/org/apache/solr/s3/S3IncrementalBackupTest.java

@@ -88,6 +88,19 @@ public static void ensureCompatibleLocale() {
   public static void setupClass() throws Exception {
     System.setProperty("aws.accessKeyId", "foo");
     System.setProperty("aws.secretAccessKey", "bar");
+    String retryMode;
+    switch (random().nextInt(3)) {
+      case 0:
+        retryMode = "legacy";
+        break;
+      case 1:
+        retryMode = "standard";
+        break;
+      default:
+        retryMode = "adaptive";
+        break;
+    }
+    System.setProperty("aws.retryMode", retryMode);
 
     AbstractS3ClientTest.setS3ConfFile();