chore: add release resources in connection provider manager (#262)

aws · Oct 23, 2024 · 4fc09b5 · 4fc09b5
1 parent ccf63a0
commit 4fc09b5
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 6 deletions.
diff --git a/common/lib/connection_provider_manager.ts b/common/lib/connection_provider_manager.ts
@@ -18,6 +18,7 @@ import { ConnectionProvider } from "./connection_provider";
 import { HostRole } from "./host_role";
 import { HostInfo } from "./host_info";
 import { AwsWrapperError } from "./utils/errors";
+import { CanReleaseResources } from "./can_release_resources";
 
 export class ConnectionProviderManager {
   private static connProvider: ConnectionProvider | null = null;
@@ -88,6 +89,18 @@ export class ConnectionProviderManager {
     return host;
   }
 
+  static async releaseResources(): Promise<any> {
+    if (ConnectionProviderManager.connProvider !== null) {
+      if (this.implementsCanReleaseResources(ConnectionProviderManager.connProvider)) {
+        await ConnectionProviderManager.connProvider.releaseResources();
+      }
+    }
+  }
+
+  private static implementsCanReleaseResources(connectionProvider: any): connectionProvider is CanReleaseResources {
+    return connectionProvider.releaseResources !== undefined;
+  }
+
   static resetProvider() {
     this.connProvider = null;
   }

diff --git a/tests/integration/container/tests/read_write_splitting.test.ts b/tests/integration/container/tests/read_write_splitting.test.ts
@@ -101,7 +101,7 @@ describe("aurora read write splitting", () => {
     }
     if (provider !== null) {
       try {
-        await provider.releaseResources();
+        await ConnectionProviderManager.releaseResources();
         ConnectionProviderManager.resetProvider();
       } catch (error) {
         // pass
@@ -589,7 +589,7 @@ describe("aurora read write splitting", () => {
       client = initClientFunc(config);
 
       provider = new InternalPooledConnectionProvider();
-      await provider.releaseResources(); // make sure there's no pool's left after prior test
+      await ConnectionProviderManager.releaseResources(); // make sure there's no pool's left after prior test
 
       ConnectionProviderManager.setConnectionProvider(provider);
 

diff --git a/tests/unit/internal_pool_connection_provider.test.ts b/tests/unit/internal_pool_connection_provider.test.ts
@@ -129,7 +129,7 @@ describe("reader write splitting test", () => {
     expect(providerSpy.getHostCount()).toBe(1);
     expect(providerSpy.getKeySet()).toEqual(expectedKeys);
     expect(providerSpy.getHostUrlSet()).toEqual(expectedHosts);
-    await provider.releaseResources();
+    await ConnectionProviderManager.releaseResources();
     ConnectionProviderManager.resetProvider();
   });
 
@@ -173,7 +173,7 @@ describe("reader write splitting test", () => {
     expect(providerSpy.getHostCount()).toBe(1);
     expect(providerSpy.getKeySet()).toEqual(expectedKeys);
     expect(providerSpy.getHostUrlSet()).toEqual(expectedHosts);
-    await provider.releaseResources();
+    await ConnectionProviderManager.releaseResources();
     ConnectionProviderManager.resetProvider();
   });
 
@@ -183,7 +183,7 @@ describe("reader write splitting test", () => {
     providerSpy.setDatabasePools(target);
     const selectedHost = providerSpy.getHostInfoByStrategy(testHostsList, HostRole.READER, "random", props);
     expect(selectedHost.host === readerUrl1Connection || selectedHost.host === readerUrl2Connection).toBeTruthy();
-    await provider.releaseResources();
+    await ConnectionProviderManager.releaseResources();
     ConnectionProviderManager.resetProvider();
   });
 
@@ -210,7 +210,7 @@ describe("reader write splitting test", () => {
     } catch (error: any) {
       expect(error.message).toEqual("testError");
     }
-    await provider.releaseResources();
+    await ConnectionProviderManager.releaseResources();
     ConnectionProviderManager.resetProvider();
   });
 });