From 693bd41ff148c49e90d927d80f37cfa6711a73f6 Mon Sep 17 00:00:00 2001 From: Ran Vaknin Date: Wed, 2 Apr 2025 14:47:11 -0700 Subject: [PATCH 1/2] Removing crt waitForNoResources --- .../http/crt/AwsCrtAsyncHttpClientSpiVerificationTest.java | 1 - .../http/crt/AwsCrtHttpClientSpiVerificationTest.java | 1 - .../amazon/awssdk/http/crt/AwsCrtHttpClientTest.java | 5 ----- .../awssdk/http/crt/AwsCrtHttpClientWireMockTest.java | 2 -- .../amazon/awssdk/http/crt/H1SAsyncServerBehaviorTest.java | 5 ----- .../software/amazon/awssdk/http/crt/ProxyWireMockTest.java | 1 - .../http/crt/internal/AwsCrtConfigurationUtilsTest.java | 6 ------ .../amazon/awssdk/transfer/s3/S3IntegrationTestBase.java | 1 - .../stability/tests/s3/S3CrtAsyncClientStabilityTest.java | 1 - .../awssdk/stability/tests/s3/S3CrtClientStabilityTest.java | 1 - 10 files changed, 24 deletions(-) diff --git a/http-clients/aws-crt-client/src/test/java/software/amazon/awssdk/http/crt/AwsCrtAsyncHttpClientSpiVerificationTest.java b/http-clients/aws-crt-client/src/test/java/software/amazon/awssdk/http/crt/AwsCrtAsyncHttpClientSpiVerificationTest.java index 45de4ba201f0..0cdb3e31cc8d 100644 --- a/http-clients/aws-crt-client/src/test/java/software/amazon/awssdk/http/crt/AwsCrtAsyncHttpClientSpiVerificationTest.java +++ b/http-clients/aws-crt-client/src/test/java/software/amazon/awssdk/http/crt/AwsCrtAsyncHttpClientSpiVerificationTest.java @@ -85,7 +85,6 @@ public static void setup() throws Exception { @AfterClass public static void tearDown() { client.close(); - CrtResource.waitForNoResources(); } private byte[] generateRandomBody(int size) { diff --git a/http-clients/aws-crt-client/src/test/java/software/amazon/awssdk/http/crt/AwsCrtHttpClientSpiVerificationTest.java b/http-clients/aws-crt-client/src/test/java/software/amazon/awssdk/http/crt/AwsCrtHttpClientSpiVerificationTest.java index 0777525c83ca..4f024993f26c 100644 --- a/http-clients/aws-crt-client/src/test/java/software/amazon/awssdk/http/crt/AwsCrtHttpClientSpiVerificationTest.java +++ b/http-clients/aws-crt-client/src/test/java/software/amazon/awssdk/http/crt/AwsCrtHttpClientSpiVerificationTest.java @@ -75,7 +75,6 @@ public static void setup() throws Exception { @AfterClass public static void tearDown() { client.close(); - CrtResource.waitForNoResources(); } private byte[] generateRandomBody(int size) { diff --git a/http-clients/aws-crt-client/src/test/java/software/amazon/awssdk/http/crt/AwsCrtHttpClientTest.java b/http-clients/aws-crt-client/src/test/java/software/amazon/awssdk/http/crt/AwsCrtHttpClientTest.java index 653f97163934..d4284e640555 100644 --- a/http-clients/aws-crt-client/src/test/java/software/amazon/awssdk/http/crt/AwsCrtHttpClientTest.java +++ b/http-clients/aws-crt-client/src/test/java/software/amazon/awssdk/http/crt/AwsCrtHttpClientTest.java @@ -41,11 +41,6 @@ public static void beforeAll() { Log.initLoggingToStdout(Log.LogLevel.Warn); } - @AfterAll - public static void afterAll() { - CrtResource.waitForNoResources(); - } - /** * default value of connectionAcquisitionTimeout of 10 will fail validatesHttpsCertificateIssuer() test * */ diff --git a/http-clients/aws-crt-client/src/test/java/software/amazon/awssdk/http/crt/AwsCrtHttpClientWireMockTest.java b/http-clients/aws-crt-client/src/test/java/software/amazon/awssdk/http/crt/AwsCrtHttpClientWireMockTest.java index 47b0f2be5bdb..ce5d778f06a1 100644 --- a/http-clients/aws-crt-client/src/test/java/software/amazon/awssdk/http/crt/AwsCrtHttpClientWireMockTest.java +++ b/http-clients/aws-crt-client/src/test/java/software/amazon/awssdk/http/crt/AwsCrtHttpClientWireMockTest.java @@ -66,8 +66,6 @@ public static void setup() { @AfterClass public static void tearDown() { - // Verify there is no resource leak. - CrtResource.waitForNoResources(); executorService.shutdown(); } diff --git a/http-clients/aws-crt-client/src/test/java/software/amazon/awssdk/http/crt/H1SAsyncServerBehaviorTest.java b/http-clients/aws-crt-client/src/test/java/software/amazon/awssdk/http/crt/H1SAsyncServerBehaviorTest.java index a9cda00dccf1..a545f048e5ff 100644 --- a/http-clients/aws-crt-client/src/test/java/software/amazon/awssdk/http/crt/H1SAsyncServerBehaviorTest.java +++ b/http-clients/aws-crt-client/src/test/java/software/amazon/awssdk/http/crt/H1SAsyncServerBehaviorTest.java @@ -36,11 +36,6 @@ public static void beforeAll() { Log.initLoggingToStdout(Log.LogLevel.Warn); } - @AfterAll - public static void afterAll() { - CrtResource.waitForNoResources(); - } - @Override protected SdkAsyncHttpClient setupClient() { return AwsCrtAsyncHttpClient.builder() diff --git a/http-clients/aws-crt-client/src/test/java/software/amazon/awssdk/http/crt/ProxyWireMockTest.java b/http-clients/aws-crt-client/src/test/java/software/amazon/awssdk/http/crt/ProxyWireMockTest.java index 47fb56d70fba..6c3322a05f6f 100644 --- a/http-clients/aws-crt-client/src/test/java/software/amazon/awssdk/http/crt/ProxyWireMockTest.java +++ b/http-clients/aws-crt-client/src/test/java/software/amazon/awssdk/http/crt/ProxyWireMockTest.java @@ -83,7 +83,6 @@ public void teardown() { } EventLoopGroup.closeStaticDefault(); HostResolver.closeStaticDefault(); - CrtResource.waitForNoResources(); } /* diff --git a/http-clients/aws-crt-client/src/test/java/software/amazon/awssdk/http/crt/internal/AwsCrtConfigurationUtilsTest.java b/http-clients/aws-crt-client/src/test/java/software/amazon/awssdk/http/crt/internal/AwsCrtConfigurationUtilsTest.java index c451c499186e..e83e29e0aea1 100644 --- a/http-clients/aws-crt-client/src/test/java/software/amazon/awssdk/http/crt/internal/AwsCrtConfigurationUtilsTest.java +++ b/http-clients/aws-crt-client/src/test/java/software/amazon/awssdk/http/crt/internal/AwsCrtConfigurationUtilsTest.java @@ -33,12 +33,6 @@ import software.amazon.awssdk.http.crt.TcpKeepAliveConfiguration; class AwsCrtConfigurationUtilsTest { - - @AfterAll - public static void tearDown() { - CrtResource.waitForNoResources(); - } - @ParameterizedTest @MethodSource("cipherPreferences") void resolveCipherPreference_pqNotSupported_shouldFallbackToSystemDefault(Boolean preferPqTls, diff --git a/services-custom/s3-transfer-manager/src/it/java/software/amazon/awssdk/transfer/s3/S3IntegrationTestBase.java b/services-custom/s3-transfer-manager/src/it/java/software/amazon/awssdk/transfer/s3/S3IntegrationTestBase.java index 1b4f7f105a38..264999a837ea 100644 --- a/services-custom/s3-transfer-manager/src/it/java/software/amazon/awssdk/transfer/s3/S3IntegrationTestBase.java +++ b/services-custom/s3-transfer-manager/src/it/java/software/amazon/awssdk/transfer/s3/S3IntegrationTestBase.java @@ -90,7 +90,6 @@ public static void cleanUpForAllIntegTests() { s3Async.close(); s3CrtAsync.close(); tmCrt.close(); - CrtResource.waitForNoResources(); } protected static S3ClientBuilder s3ClientBuilder() { diff --git a/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/s3/S3CrtAsyncClientStabilityTest.java b/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/s3/S3CrtAsyncClientStabilityTest.java index 10c803700cb5..8c0069fdd1d6 100644 --- a/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/s3/S3CrtAsyncClientStabilityTest.java +++ b/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/s3/S3CrtAsyncClientStabilityTest.java @@ -56,7 +56,6 @@ public static void cleanup() { } s3CrtAsyncClient.close(); s3ApacheClient.close(); - CrtResource.waitForNoResources(); } @Override diff --git a/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/s3/S3CrtClientStabilityTest.java b/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/s3/S3CrtClientStabilityTest.java index dfbcbf26e6b3..6d9170af4d51 100644 --- a/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/s3/S3CrtClientStabilityTest.java +++ b/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/s3/S3CrtClientStabilityTest.java @@ -74,7 +74,6 @@ public static void cleanup() { } s3Client.close(); s3ApacheClient.close(); - CrtResource.waitForNoResources(); futureThreadPool.shutdown(); try { futureThreadPool.awaitTermination(5, TimeUnit.SECONDS); From 5ba6a7ba0c023928b83c96286381da69190de02e Mon Sep 17 00:00:00 2001 From: Ran Vaknin Date: Wed, 2 Apr 2025 15:43:02 -0700 Subject: [PATCH 2/2] Reverting changes for non-crt packages --- .../amazon/awssdk/transfer/s3/S3IntegrationTestBase.java | 1 + .../awssdk/stability/tests/s3/S3CrtAsyncClientStabilityTest.java | 1 + .../awssdk/stability/tests/s3/S3CrtClientStabilityTest.java | 1 + 3 files changed, 3 insertions(+) diff --git a/services-custom/s3-transfer-manager/src/it/java/software/amazon/awssdk/transfer/s3/S3IntegrationTestBase.java b/services-custom/s3-transfer-manager/src/it/java/software/amazon/awssdk/transfer/s3/S3IntegrationTestBase.java index 264999a837ea..1b4f7f105a38 100644 --- a/services-custom/s3-transfer-manager/src/it/java/software/amazon/awssdk/transfer/s3/S3IntegrationTestBase.java +++ b/services-custom/s3-transfer-manager/src/it/java/software/amazon/awssdk/transfer/s3/S3IntegrationTestBase.java @@ -90,6 +90,7 @@ public static void cleanUpForAllIntegTests() { s3Async.close(); s3CrtAsync.close(); tmCrt.close(); + CrtResource.waitForNoResources(); } protected static S3ClientBuilder s3ClientBuilder() { diff --git a/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/s3/S3CrtAsyncClientStabilityTest.java b/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/s3/S3CrtAsyncClientStabilityTest.java index 8c0069fdd1d6..10c803700cb5 100644 --- a/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/s3/S3CrtAsyncClientStabilityTest.java +++ b/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/s3/S3CrtAsyncClientStabilityTest.java @@ -56,6 +56,7 @@ public static void cleanup() { } s3CrtAsyncClient.close(); s3ApacheClient.close(); + CrtResource.waitForNoResources(); } @Override diff --git a/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/s3/S3CrtClientStabilityTest.java b/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/s3/S3CrtClientStabilityTest.java index 6d9170af4d51..dfbcbf26e6b3 100644 --- a/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/s3/S3CrtClientStabilityTest.java +++ b/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/s3/S3CrtClientStabilityTest.java @@ -74,6 +74,7 @@ public static void cleanup() { } s3Client.close(); s3ApacheClient.close(); + CrtResource.waitForNoResources(); futureThreadPool.shutdown(); try { futureThreadPool.awaitTermination(5, TimeUnit.SECONDS);