fix integration test

aws · Nov 6, 2024 · 0a6d2e5 · 0a6d2e5
1 parent ff76e04
commit 0a6d2e5
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 14 deletions.
diff --git a/jest.integration.config.json b/jest.integration.config.json
@@ -1,6 +1,6 @@
 {
   "moduleFileExtensions": ["ts", "js", "json"],
-  "testMatch": ["<rootDir>/tests/integration/container/tests/*.(spec|test).ts|tsx"],
+  "testMatch": ["<rootDir>/tests/integration/container/tests/read_write_splitting.(spec|test).ts|tsx"],
   "transform": {
     "^.+\\.ts$": [
       "ts-jest",

diff --git a/pg/lib/pg_pool_client.ts b/pg/lib/pg_pool_client.ts
@@ -30,6 +30,10 @@ export class AwsPgPoolClient implements AwsPoolClient {
         logger.debug(err);
       });
     });
+    // this.targetPool.on("error", (err, client) => {
+    //   console.error("Unexpected error on idle client", err);
+    //   process.exit(-1);
+    // });
   }
 
   async end(): Promise<any> {

diff --git a/tests/integration/container/tests/read_write_splitting.test.ts b/tests/integration/container/tests/read_write_splitting.test.ts
@@ -107,6 +107,14 @@ describe("aurora read write splitting", () => {
         // pass
       }
     }
+    if (provider !== null) {
+      try {
+        await ConnectionProviderManager.releaseResources();
+        ConnectionProviderManager.resetProvider();
+      } catch (error) {
+        // pass
+      }
+    }
     logger.info(`Test finished: ${expect.getState().currentTestName}`);
   }, 1320000);
 
@@ -481,7 +489,7 @@ describe("aurora read write splitting", () => {
     "test pooled connection failover",
     async () => {
       const config = await initConfigWithFailover(env.databaseInfo.writerInstanceEndpoint, env.databaseInfo.instanceEndpointPort, false);
-      const provider = new InternalPooledConnectionProvider();
+      provider = new InternalPooledConnectionProvider();
       ConnectionProviderManager.setConnectionProvider(provider);
 
       client = initClientFunc(config);
@@ -516,8 +524,6 @@ describe("aurora read write splitting", () => {
       provider.logConnections();
       try {
         await secondaryClient.end();
-        await ConnectionProviderManager.releaseResources();
-        ConnectionProviderManager.resetProvider();
       } catch (error) {
         // pass
       }
@@ -532,7 +538,7 @@ describe("aurora read write splitting", () => {
       client = initClientFunc(config);
       secondaryClient = initClientFunc(config);
 
-      const provider = new InternalPooledConnectionProvider(
+      provider = new InternalPooledConnectionProvider(
         new AwsPoolConfig({
           minConnections: 0,
           maxConnections: 10,
@@ -658,7 +664,7 @@ describe("aurora read write splitting", () => {
       const connectedReaderIds: Set<string> = new Set();
       const connectionsSet: Set<any> = new Set();
       try {
-        const provider = new InternalPooledConnectionProvider({ maxConnections: numInstances });
+        provider = new InternalPooledConnectionProvider({ maxConnections: numInstances });
         ConnectionProviderManager.setConnectionProvider(provider);
         const config = await initDefaultConfig(env.databaseInfo.writerInstanceEndpoint, env.databaseInfo.instanceEndpointPort, false);
         config["readerHostSelectorStrategy"] = "leastConnections";
@@ -682,8 +688,6 @@ describe("aurora read write splitting", () => {
         for (const connection of connectionsSet) {
           await connection.end();
         }
-        await ConnectionProviderManager.releaseResources();
-        ConnectionProviderManager.resetProvider();
       }
     },
     1000000
@@ -707,7 +711,7 @@ describe("aurora read write splitting", () => {
       const numOverloadedReaderConnections = 3;
       const numInstances = env.databaseInfo.instances.length;
       const numTestConnections = (numInstances - 2) * numOverloadedReaderConnections;
-      const provider = new InternalPooledConnectionProvider({ maxConnections: numTestConnections }, myKeyFunc);
+      provider = new InternalPooledConnectionProvider({ maxConnections: numTestConnections }, myKeyFunc);
       ConnectionProviderManager.setConnectionProvider(provider);
 
       let overloadedReaderId;
@@ -745,8 +749,6 @@ describe("aurora read write splitting", () => {
         for (const connection of connectionsSet) {
           await connection.end();
         }
-        await ConnectionProviderManager.releaseResources();
-        ConnectionProviderManager.resetProvider();
       }
     },
     1000000

diff --git a/tests/unit/internal_pool_connection_provider.test.ts b/tests/unit/internal_pool_connection_provider.test.ts
@@ -133,7 +133,7 @@ describe("internal pool connection provider test", () => {
     props.set(WrapperProperties.USER.name, "mySqlUser");
     props.set(WrapperProperties.PASSWORD.name, "mySqlPassword");
 
-    when(mockRdsUtils.isRdsDns(anything())).thenReturn(null);
+    when(mockRdsUtils.isRdsDns(anything())).thenReturn(false);
     when(mockRdsUtils.isGreenInstance(anything())).thenReturn(null);
     when(mockRdsUtils.isRdsInstance("instance1")).thenReturn(true);
     const config = {
@@ -166,7 +166,7 @@ describe("internal pool connection provider test", () => {
     props.set(WrapperProperties.USER.name, "mySqlUser");
     props.set(WrapperProperties.PASSWORD.name, "mySqlPassword");
 
-    when(mockRdsUtils.isRdsDns(anything())).thenReturn(null);
+    when(mockRdsUtils.isRdsDns(anything())).thenReturn(false);
     when(mockRdsUtils.isGreenInstance(anything())).thenReturn(null);
     when(mockRdsUtils.isRdsInstance("instance1")).thenReturn(true);
     when(mockPluginService.getDialect()).thenReturn(mockDialect);
@@ -222,7 +222,7 @@ describe("internal pool connection provider test", () => {
 
     when(mockPluginService.getCurrentHostInfo()).thenReturn(hostInfo);
     when(mockPluginService.getDialect()).thenReturn(mockDialectInstance);
-    when(mockRdsUtils.isRdsDns(anything())).thenReturn(null);
+    when(mockRdsUtils.isRdsDns(anything())).thenReturn(false);
     when(mockRdsUtils.isGreenInstance(anything())).thenReturn(null);
     when(mockRdsUtils.isRdsInstance("instance1")).thenReturn(true);
     when(mockDriverDialect.preparePoolClientProperties(anything(), anything())).thenReturn(props);