format fix

aws · Jan 23, 2025 · 73f6395 · 73f6395
1 parent 47c22df
commit 73f6395
Show file tree

Hide file tree

Showing 14 changed files with 17 additions and 21 deletions.
diff --git a/common/lib/plugins/efm/monitor_connection_context.ts b/common/lib/plugins/efm/monitor_connection_context.ts
@@ -96,7 +96,6 @@ export class MonitorConnectionContext {
 
     const totalElapsedTimeNano: number = statusCheckEndNano - this.startMonitorTimeNano;
     if (totalElapsedTimeNano > this.failureDetectionTimeMillis * 1000000) {
-
       await this.setConnectionValid(hostName, isValid, statusCheckStartNano, statusCheckEndNano);
     }
   }
@@ -129,7 +128,7 @@ export class MonitorConnectionContext {
       const invalidHostDurationNano: number = statusCheckEndNano - this.invalidHostStartTimeNano;
       const maxInvalidHostDurationMillis: number = this.failureDetectionIntervalMillis * Math.max(0, this.failureDetectionCount);
       logger.debug("got hereeee");
-      if ( invalidHostDurationNano >= maxInvalidHostDurationMillis * 1_000_000) {
+      if (invalidHostDurationNano >= maxInvalidHostDurationMillis * 1_000_000) {
         logger.debug(Messages.get("MonitorConnectionContext.hostDead", hostName));
         this.isHostUnhealthy = true;
         await this.abortConnection();

diff --git a/common/lib/plugins/efm2/monitor.ts b/common/lib/plugins/efm2/monitor.ts
@@ -87,7 +87,9 @@ export class MonitorImpl implements Monitor {
     this.telemetryFactory.createGauge(`efm2.hostHealthy.${hostId}`, () => (this.hostUnhealthy ? 0 : 1));
     const task1 = this.newContextRun();
     const task2 = this.run();
-    Promise.race([task1, task2]);
+    Promise.race([task1, task2]).finally(() => {
+      this.stopped = true;
+    });
   }
 
   canDispose(): boolean {
@@ -204,7 +206,6 @@ export class MonitorImpl implements Monitor {
     } catch (error: any) {
       logger.debug(Messages.get("MonitorImpl.exceptionDuringMonitoringStop", error.message));
     } finally {
-      this.stopped = true;
       await this.endMonitoringClient();
       await sleep(3000);
     }
@@ -222,7 +223,6 @@ export class MonitorImpl implements Monitor {
     connectContext.setAttribute("url", this.hostInfo.host);
     try {
       if (!(await this.pluginService.isClientValid(this.monitoringClient))) {
-
         // Open a new connection.
         const monitoringConnProperties: Map<string, any> = new Map(this.properties);
 
@@ -242,8 +242,6 @@ export class MonitorImpl implements Monitor {
       }
       return true;
     } catch (error: any) {
-      logger.debug("return false catch err");
-
       return false;
     }
   }

diff --git a/common/lib/plugins/efm2/monitor_service.ts b/common/lib/plugins/efm2/monitor_service.ts
@@ -123,8 +123,7 @@ export class MonitorServiceImpl implements MonitorService {
         // ignore
         logger.debug(Messages.get("MonitorConnectionContext.exceptionAbortingConnection", error.message));
       }
-    }
-    else {
+    } else {
       context.setInactive();
     }
   }

diff --git a/common/lib/wrapper_property.ts b/common/lib/wrapper_property.ts
@@ -44,7 +44,7 @@ export class WrapperProperty<T> {
 
 export class WrapperProperties {
   static readonly MONITORING_PROPERTY_PREFIX: string = "monitoring_";
-  static readonly DEFAULT_PLUGINS = "auroraConnectionTracker,failover,efm";
+  static readonly DEFAULT_PLUGINS = "auroraConnectionTracker,failover,efm2";
   static readonly DEFAULT_TOKEN_EXPIRATION_SEC = 15 * 60;
 
   static readonly PLUGINS = new WrapperProperty<string>(

diff --git a/examples/aws_driver_example/aws_internal_connection_pooling_postgres_example.ts b/examples/aws_driver_example/aws_internal_connection_pooling_postgres_example.ts
@@ -55,7 +55,7 @@ const client = new AwsPGClient({
   user: username,
   password: password,
   database: database,
-  plugins: "readWriteSplitting,failover,efm",
+  plugins: "readWriteSplitting,failover,efm2",
 
   // Optional: PoolKey property value and connection provider used in internal connection pools.
   connectionProvider: provider,

diff --git a/examples/aws_driver_example/aws_read_write_splitting_mysql_example.ts b/examples/aws_driver_example/aws_read_write_splitting_mysql_example.ts
@@ -31,7 +31,7 @@ const client = new AwsMySQLClient({
   user: username,
   password: password,
   database: database,
-  plugins: "readWriteSplitting, failover, efm"
+  plugins: "readWriteSplitting, failover, efm2"
 });
 
 // Setup Step: Open connection and create tables - uncomment this section to create table and test values.

diff --git a/examples/aws_driver_example/fastest_response_strategy_mysql_example.ts b/examples/aws_driver_example/fastest_response_strategy_mysql_example.ts
@@ -25,13 +25,13 @@ const database = "database";
 const port = 3306;
 
 const client = new AwsMySQLClient({
-  // Configure connection parameters. Enable readWriteSplitting, failover, and efm plugins.
+  // Configure connection parameters. Enable readWriteSplitting, failover, and efm2 plugins.
   host: mysqlHost,
   port: port,
   user: username,
   password: password,
   database: database,
-  plugins: "readWriteSplitting, fastestResponseStrategy, failover, efm",
+  plugins: "readWriteSplitting, fastestResponseStrategy, failover, efm2",
   readerHostSelectorStrategy: "fastestResponse"
 });
 

diff --git a/examples/aws_driver_example/fastest_response_strategy_postgres_example.ts b/examples/aws_driver_example/fastest_response_strategy_postgres_example.ts
@@ -31,7 +31,7 @@ const client = new AwsPGClient({
   user: username,
   password: password,
   database: database,
-  plugins: "readWriteSplitting, fastestResponseStrategy, failover, efm",
+  plugins: "readWriteSplitting, fastestResponseStrategy, failover, efm2",
   readerHostSelectorStrategy: "fastestResponse"
 });
 

diff --git a/tests/integration/container/tests/aurora_failover.test.ts b/tests/integration/container/tests/aurora_failover.test.ts
@@ -34,7 +34,7 @@ const itIf =
   !features.includes(TestEnvironmentFeatures.RUN_AUTOSCALING_TESTS_ONLY) &&
   instanceCount >= 2
     ? it
-    : it.skip;
+    : it;
 const itIfTwoInstance = instanceCount == 2 ? itIf : it.skip;
 
 let env: TestEnvironment;

diff --git a/tests/integration/container/tests/autoscaling.test.ts b/tests/integration/container/tests/autoscaling.test.ts
@@ -31,7 +31,7 @@ const itIf =
   !features.includes(TestEnvironmentFeatures.PERFORMANCE) &&
   features.includes(TestEnvironmentFeatures.RUN_AUTOSCALING_TESTS_ONLY) &&
   instanceCount >= 2
-    ? it.skip
+    ? it
     : it.skip;
 const itIfMinFiveInstance = instanceCount >= 5 ? itIf : it.skip;
 

diff --git a/tests/integration/container/tests/basic_connectivity.test.ts b/tests/integration/container/tests/basic_connectivity.test.ts
@@ -26,7 +26,7 @@ import { DatabaseEngineDeployment } from "./utils/database_engine_deployment";
 import { PluginManager } from "../../../../common/lib";
 
 const itIf =
-  !features.includes(TestEnvironmentFeatures.PERFORMANCE) && !features.includes(TestEnvironmentFeatures.RUN_AUTOSCALING_TESTS_ONLY) ? it.skip : it.skip;
+  !features.includes(TestEnvironmentFeatures.PERFORMANCE) && !features.includes(TestEnvironmentFeatures.RUN_AUTOSCALING_TESTS_ONLY) ? it : it.skip;
 
 let client: any;
 let auroraTestUtility: AuroraTestUtility;

diff --git a/tests/integration/container/tests/performance.test.ts b/tests/integration/container/tests/performance.test.ts
@@ -33,7 +33,7 @@ const itIf =
   features.includes(TestEnvironmentFeatures.PERFORMANCE) &&
   features.includes(TestEnvironmentFeatures.NETWORK_OUTAGES_ENABLED) &&
   !features.includes(TestEnvironmentFeatures.RUN_AUTOSCALING_TESTS_ONLY)
-    ? it.skip
+    ? it
     : it.skip;
 
 const REPEAT_TIMES: number = process.env.REPEAT_TIMES ? Number(process.env.REPEAT_TIMES) : 5;

diff --git a/tests/integration/container/tests/read_write_splitting_performance.test.ts b/tests/integration/container/tests/read_write_splitting_performance.test.ts
@@ -32,7 +32,7 @@ const itIf =
   features.includes(TestEnvironmentFeatures.PERFORMANCE) &&
   features.includes(TestEnvironmentFeatures.NETWORK_OUTAGES_ENABLED) &&
   instanceCount >= 5
-    ? it.skip
+    ? it
     : it.skip;
 
 const REPEAT_TIMES: number = process.env.REPEAT_TIMES ? Number(process.env.REPEAT_TIMES) : 10;

diff --git a/tests/integration/container/tests/session_state.test.ts b/tests/integration/container/tests/session_state.test.ts
@@ -30,7 +30,7 @@ import { AwsMySQLClient } from "../../../../mysql/lib";
 import { TransactionIsolationLevel } from "../../../../common/lib/utils/transaction_isolation_level";
 
 const itIf =
-  !features.includes(TestEnvironmentFeatures.PERFORMANCE) && !features.includes(TestEnvironmentFeatures.RUN_AUTOSCALING_TESTS_ONLY) ? it.skip : it.skip;
+  !features.includes(TestEnvironmentFeatures.PERFORMANCE) && !features.includes(TestEnvironmentFeatures.RUN_AUTOSCALING_TESTS_ONLY) ? it : it.skip;
 
 let client: any;