Skip to content

Commit 55584bb

Browse files
committed
remove releaseResources from Client.end
1 parent 6669b1a commit 55584bb

File tree

9 files changed

+14
-3
lines changed

9 files changed

+14
-3
lines changed

mysql/lib/client.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,6 @@ export class AwsMySQLClient extends AwsClient {
213213
},
214214
null
215215
);
216-
await PluginManager.releaseResources();
217216
return result;
218217
}
219218

pg/lib/client.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ import { RdsMultiAZPgDatabaseDialect } from "./dialect/rds_multi_az_pg_database_
3030
import { HostInfo } from "../../common/lib/host_info";
3131
import { TelemetryTraceLevel } from "../../common/lib/utils/telemetry/telemetry_trace_level";
3232
import { NodePostgresDriverDialect } from "./dialect/node_postgres_driver_dialect";
33-
import { PluginManager } from "../../common/lib";
3433

3534
export class AwsPGClient extends AwsClient {
3635
private static readonly knownDialectsByCode: Map<string, DatabaseDialect> = new Map([
@@ -190,7 +189,6 @@ export class AwsPGClient extends AwsClient {
190189
},
191190
null
192191
);
193-
await PluginManager.releaseResources();
194192
return result;
195193
}
196194

tests/integration/container/tests/aurora_failover.test.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import { RdsUtils } from "../../../../common/lib/utils/rds_utils";
2525
import { logger } from "../../../../common/logutils";
2626
import { features, instanceCount } from "./config";
2727
import { TestEnvironmentFeatures } from "./utils/test_environment_features";
28+
import { PluginManager } from "../../../../common/lib";
2829

2930
const itIf =
3031
features.includes(TestEnvironmentFeatures.FAILOVER_SUPPORTED) &&
@@ -94,6 +95,7 @@ describe("aurora failover", () => {
9495
// pass
9596
}
9697
}
98+
await PluginManager.releaseResources();
9799
logger.info(`Test finished: ${expect.getState().currentTestName}`);
98100
}, 1320000);
99101

tests/integration/container/tests/autoscaling.test.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import { ConnectionProviderManager } from "../../../../common/lib/connection_pro
2626
import { TestInstanceInfo } from "./utils/test_instance_info";
2727
import { sleep } from "../../../../common/lib/utils/utils";
2828
import { FailoverSuccessError } from "../../../../common/lib/utils/errors";
29+
import { PluginManager } from "../../../../common/lib";
2930

3031
const itIf =
3132
!features.includes(TestEnvironmentFeatures.PERFORMANCE) &&
@@ -109,6 +110,7 @@ describe("pooled connection autoscaling", () => {
109110
// pass
110111
}
111112
}
113+
await PluginManager.releaseResources();
112114
logger.info(`Test finished: ${expect.getState().currentTestName}`);
113115
}, 1320000);
114116

tests/integration/container/tests/basic_connectivity.test.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import { DatabaseEngine } from "./utils/database_engine";
2323
import { TestEnvironmentFeatures } from "./utils/test_environment_features";
2424
import { features } from "./config";
2525
import { DatabaseEngineDeployment } from "./utils/database_engine_deployment";
26+
import { PluginManager } from "../../../../common/lib";
2627

2728
const itIf =
2829
!features.includes(TestEnvironmentFeatures.PERFORMANCE) && !features.includes(TestEnvironmentFeatures.RUN_AUTOSCALING_TESTS_ONLY) ? it : it.skip;
@@ -54,6 +55,7 @@ afterEach(async () => {
5455
// pass
5556
}
5657
}
58+
await PluginManager.releaseResources();
5759
logger.info(`Test finished: ${expect.getState().currentTestName}`);
5860
}, 1320000);
5961

tests/integration/container/tests/iam_authentication.test.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import { IamAuthenticationPlugin } from "../../../../common/lib/authentication/i
2626
import { logger } from "../../../../common/logutils";
2727
import { TestEnvironmentFeatures } from "./utils/test_environment_features";
2828
import { features } from "./config";
29+
import { PluginManager } from "../../../../common/lib";
2930

3031
const itIf =
3132
!features.includes(TestEnvironmentFeatures.PERFORMANCE) &&
@@ -89,6 +90,7 @@ describe("iam authentication", () => {
8990
});
9091

9192
afterEach(async () => {
93+
await PluginManager.releaseResources();
9294
await TestEnvironment.verifyClusterStatus();
9395
logger.info(`Test finished: ${expect.getState().currentTestName}`);
9496
}, 1320000);

tests/integration/container/tests/performance.test.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import { features } from "./config";
2626
import { MonitorServiceImpl } from "../../../../common/lib/plugins/efm/monitor_service";
2727
import { PerfStat } from "./utils/perf_stat";
2828
import { PerfTestUtility } from "./utils/perf_util";
29+
import { PluginManager } from "../../../../common/lib";
2930

3031
const itIf =
3132
features.includes(TestEnvironmentFeatures.FAILOVER_SUPPORTED) &&
@@ -253,6 +254,7 @@ describe("performance", () => {
253254
});
254255

255256
afterEach(async () => {
257+
await PluginManager.releaseResources();
256258
await TestEnvironment.verifyClusterStatus();
257259
logger.info(`Test finished: ${expect.getState().currentTestName}`);
258260
}, 1320000);

tests/integration/container/tests/read_write_splitting.test.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ import { AwsPoolConfig } from "../../../../common/lib/aws_pool_config";
2929
import { ConnectionProviderManager } from "../../../../common/lib/connection_provider_manager";
3030
import { InternalPoolMapping } from "../../../../common/lib/utils/internal_pool_mapping";
3131
import { HostInfo } from "../../../../common/lib/host_info";
32+
import { PluginManager } from "../../../../common/lib";
3233

3334
const itIf =
3435
!features.includes(TestEnvironmentFeatures.PERFORMANCE) &&
@@ -121,6 +122,7 @@ describe("aurora read write splitting", () => {
121122
// pass
122123
}
123124
}
125+
await PluginManager.releaseResources();
124126
logger.info(`Test finished: ${expect.getState().currentTestName}`);
125127
}, 1320000);
126128

tests/integration/container/tests/read_write_splitting_performance.test.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import { ExecuteTimePlugin } from "../../../../common/lib/plugins/execute_time_p
2626
import { TestDriver } from "./utils/test_driver";
2727
import { ConnectionProviderManager } from "../../../../common/lib/connection_provider_manager";
2828
import { InternalPooledConnectionProvider } from "../../../../common/lib/internal_pooled_connection_provider";
29+
import { PluginManager } from "../../../../common/lib";
2930

3031
const itIf =
3132
features.includes(TestEnvironmentFeatures.FAILOVER_SUPPORTED) &&
@@ -52,6 +53,7 @@ describe("rwperformance", () => {
5253
});
5354

5455
afterEach(async () => {
56+
await PluginManager.releaseResources();
5557
logger.info(`Test finished: ${expect.getState().currentTestName}`);
5658
}, 1320000);
5759

0 commit comments

Comments
 (0)