Skip to content

Commit ca9564c

Browse files
authored
fix: MultiAZ failover2 and connectivity integration tests timing out (#458)
1 parent 3e5a75f commit ca9564c

4 files changed

Lines changed: 10 additions & 2 deletions

File tree

common/lib/plugins/efm2/monitor_connection_context.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,9 @@ export class MonitorConnectionContext {
3232
* @param clientToAbort A reference to the connection associated with this context that will be aborted.
3333
*/
3434
constructor(clientToAbort: ClientWrapper) {
35-
this.clientToAbortRef = new WeakRef(clientToAbort);
35+
if (clientToAbort) {
36+
this.clientToAbortRef = new WeakRef(clientToAbort);
37+
}
3638
}
3739

3840
setHostUnhealthy(hostUnhealthy: boolean) {

common/lib/utils/utils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ export function convertNanosToMs(nanos: bigint) {
7474
}
7575

7676
export function convertNanosToMinutes(nanos: bigint) {
77-
return Number(nanos) / 60000000000;
77+
return Number(nanos) / 60_000_000_000;
7878
}
7979

8080
export function maskProperties(props: Map<string, any>) {

tests/integration/container/tests/aurora_failover2.test.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ async function initDefaultConfig(host: string, port: number, connectToProxy: boo
5353
password: env.databaseInfo.password,
5454
port: port,
5555
plugins: "failover2",
56+
failoverTimeoutMs: 250000,
5657
enableTelemetry: true,
5758
telemetryTracesBackend: "OTLP",
5859
telemetryMetricsBackend: "OTLP"

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ describe("basic_connectivity", () => {
7474
password: env.databaseInfo.password,
7575
port: env.databaseInfo.clusterEndpointPort,
7676
plugins: "failover,efm2",
77+
wrapperConnectTimeout: 120000,
7778
enableTelemetry: true,
7879
telemetryTracesBackend: "OTLP",
7980
telemetryMetricsBackend: "OTLP"
@@ -100,6 +101,7 @@ describe("basic_connectivity", () => {
100101
password: env.databaseInfo.password,
101102
port: env.databaseInfo.clusterEndpointPort,
102103
plugins: "failover,efm2",
104+
wrapperConnectTimeout: 120000,
103105
enableTelemetry: true,
104106
telemetryTracesBackend: "OTLP",
105107
telemetryMetricsBackend: "OTLP"
@@ -126,6 +128,7 @@ describe("basic_connectivity", () => {
126128
password: env.databaseInfo.password,
127129
port: env.databaseInfo.clusterEndpointPort,
128130
plugins: "failover,efm2",
131+
wrapperConnectTimeout: 120000,
129132
enableTelemetry: true,
130133
telemetryTracesBackend: "OTLP",
131134
telemetryMetricsBackend: "OTLP"
@@ -152,6 +155,7 @@ describe("basic_connectivity", () => {
152155
password: env.databaseInfo.password,
153156
port: env.databaseInfo.instanceEndpointPort,
154157
plugins: "",
158+
wrapperConnectTimeout: 120000,
155159
enableTelemetry: true,
156160
telemetryTracesBackend: "OTLP",
157161
telemetryMetricsBackend: "OTLP"
@@ -182,6 +186,7 @@ describe("basic_connectivity", () => {
182186
password: env.databaseInfo.password,
183187
port: env.proxyDatabaseInfo.instanceEndpointPort,
184188
plugins: "",
189+
wrapperConnectTimeout: 120000,
185190
clusterInstanceHostPattern: "?." + env.proxyDatabaseInfo.instanceEndpointSuffix,
186191
enableTelemetry: true,
187192
telemetryTracesBackend: "OTLP",

0 commit comments

Comments
 (0)