Fix stability tests to not create a new client per request

Author: zoewangg

test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/s3/S3BaseStabilityTest.java

@@ -23,7 +23,6 @@
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.function.IntFunction;
-
 import org.apache.commons.lang3.RandomStringUtils;
 import software.amazon.awssdk.core.async.AsyncRequestBody;
 import software.amazon.awssdk.core.async.AsyncResponseTransformer;
@@ -46,6 +45,7 @@ public abstract class S3BaseStabilityTest extends AwsTestBase {
     protected static final String LARGE_KEY_NAME = "2GB";
 
     protected static S3Client s3ApacheClient;
+    private final S3AsyncClient testClient;
 
     static {
         s3ApacheClient = S3Client.builder()
@@ -56,16 +56,18 @@ public abstract class S3BaseStabilityTest extends AwsTestBase {
                                  .build();
     }
 
+    public S3BaseStabilityTest(S3AsyncClient testClient) {
+        this.testClient = testClient;
+    }
+
     protected String computeKeyName(int i) {
         return "key_" + i;
     }
 
-    protected abstract S3AsyncClient getTestClient();
-
     protected abstract String getTestBucketName();
 
     protected void doGetBucketAcl_lowTpsLongInterval() {
-        IntFunction<CompletableFuture<?>> future = i -> getTestClient().getBucketAcl(b -> b.bucket(getTestBucketName()));
+        IntFunction<CompletableFuture<?>> future = i -> testClient.getBucketAcl(b -> b.bucket(getTestBucketName()));
         String className = this.getClass().getSimpleName();
         StabilityTestRunner.newRunner()
                 .testName(className + ".getBucketAcl_lowTpsLongInterval")
@@ -81,7 +83,7 @@ protected void downloadLargeObjectToFile() {
         File randomTempFile = RandomTempFile.randomUncreatedFile();
         StabilityTestRunner.newRunner()
                 .testName("S3AsyncStabilityTest.downloadLargeObjectToFile")
-                .futures(getTestClient().getObject(b -> b.bucket(getTestBucketName()).key(LARGE_KEY_NAME),
+                .futures(testClient.getObject(b -> b.bucket(getTestBucketName()).key(LARGE_KEY_NAME),
                         AsyncResponseTransformer.toFile(randomTempFile)))
                 .run();
         randomTempFile.delete();
@@ -93,7 +95,7 @@ protected void uploadLargeObjectFromFile() {
             file = new RandomTempFile((long) 2e+9);
             StabilityTestRunner.newRunner()
                     .testName("S3AsyncStabilityTest.uploadLargeObjectFromFile")
-                    .futures(getTestClient().putObject(b -> b.bucket(getTestBucketName()).key(LARGE_KEY_NAME),
+                    .futures(testClient.putObject(b -> b.bucket(getTestBucketName()).key(LARGE_KEY_NAME),
                             AsyncRequestBody.fromFile(file)))
                     .run();
         } catch (IOException e) {
@@ -110,7 +112,7 @@ protected void putObject() {
 
         IntFunction<CompletableFuture<?>> future = i -> {
             String keyName = computeKeyName(i);
-            return getTestClient().putObject(b -> b.bucket(getTestBucketName()).key(keyName),
+            return testClient.putObject(b -> b.bucket(getTestBucketName()).key(keyName),
                     AsyncRequestBody.fromBytes(bytes));
         };
 
@@ -127,7 +129,7 @@ protected void getObject() {
         IntFunction<CompletableFuture<?>> future = i -> {
             String keyName = computeKeyName(i);
             Path path = RandomTempFile.randomUncreatedFile().toPath();
-            return getTestClient().getObject(b -> b.bucket(getTestBucketName()).key(keyName), AsyncResponseTransformer.toFile(path));
+            return testClient.getObject(b -> b.bucket(getTestBucketName()).key(keyName), AsyncResponseTransformer.toFile(path));
         };
 
         StabilityTestRunner.newRunner()

test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/s3/S3CrtAsyncClientStabilityTest.java

@@ -29,19 +29,22 @@
  */
 public class S3CrtAsyncClientStabilityTest extends S3BaseStabilityTest {
     private static final String BUCKET_NAME = "s3crtasyncclinetstabilitytests" + System.currentTimeMillis();
+    private static S3CrtAsyncClient s3CrtAsyncClient;
 
-    @Override
-    protected S3AsyncClient getTestClient() {
-        return S3CrtAsyncClient.builder()
-                               .region(Region.US_WEST_2)
-                               .credentialsProvider(CREDENTIALS_PROVIDER_CHAIN)
-                               .build();
+    static {
+        s3CrtAsyncClient = S3CrtAsyncClient.builder()
+                                           .region(Region.US_WEST_2)
+                                           .credentialsProvider(CREDENTIALS_PROVIDER_CHAIN)
+                                           .build();
+    }
+
+    public S3CrtAsyncClientStabilityTest() {
+        super(s3CrtAsyncClient);
     }
 
     @BeforeAll
     public static void setup() {
         s3ApacheClient.createBucket(b -> b.bucket(BUCKET_NAME));
-
     }
 
     @AfterAll
@@ -53,9 +56,10 @@ public static void cleanup() {
                                      .build()) {
             deleteBucketAndAllContents(s3NettyClient, BUCKET_NAME);
         }
+        s3CrtAsyncClient.close();
+        s3ApacheClient.close();
     }
 
-
     @Override
     protected String getTestBucketName() {
         return BUCKET_NAME;

test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/s3/S3NettyAsyncStabilityTest.java

@@ -27,6 +27,10 @@ public class S3NettyAsyncStabilityTest extends S3BaseStabilityTest {
                 .build();
     }
 
+    public S3NettyAsyncStabilityTest() {
+        super(s3NettyClient);
+    }
+
     @BeforeAll
     public static void setup() {
         s3NettyClient.createBucket(b -> b.bucket(bucketName)).join();
@@ -38,9 +42,6 @@ public static void cleanup() {
         s3NettyClient.close();
     }
 
-    @Override
-    protected S3AsyncClient getTestClient() { return s3NettyClient; }
-
     @Override
     protected String getTestBucketName() { return bucketName; }
 

test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/s3/S3WithCrtAsyncHttpClientStabilityTest.java

@@ -1,18 +1,15 @@
 package software.amazon.awssdk.stability.tests.s3;
 
+import java.time.Duration;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import software.amazon.awssdk.core.retry.RetryPolicy;
-import software.amazon.awssdk.crt.io.EventLoopGroup;
-import software.amazon.awssdk.crt.io.HostResolver;
 import software.amazon.awssdk.http.async.SdkAsyncHttpClient;
 import software.amazon.awssdk.http.crt.AwsCrtAsyncHttpClient;
 import software.amazon.awssdk.services.s3.S3AsyncClient;
 import software.amazon.awssdk.stability.tests.exceptions.StabilityTestsRetryableException;
 import software.amazon.awssdk.stability.tests.utils.RetryableTest;
 
-import java.time.Duration;
-
 /**
  * Stability tests for {@link S3AsyncClient} using {@link AwsCrtAsyncHttpClient}
  */
@@ -36,6 +33,10 @@ public class S3WithCrtAsyncHttpClientStabilityTest extends S3BaseStabilityTest {
                 .build();
     }
 
+    public S3WithCrtAsyncHttpClientStabilityTest() {
+        super(s3CrtClient);
+    }
+
     @BeforeAll
     public static void setup() {
         s3CrtClient.createBucket(b -> b.bucket(bucketName)).join();
@@ -47,9 +48,6 @@ public static void cleanup() {
         s3CrtClient.close();
     }
 
-    @Override
-    protected S3AsyncClient getTestClient() { return s3CrtClient; }
-
     @Override
     protected String getTestBucketName() { return bucketName; }