@@ -47,6 +47,7 @@ public class AuroraPostgresPerformanceTest extends AuroraPostgresBaseTest {
4747 ? 5
4848 : Integer .parseInt (System .getenv ("REPEAT_TIMES" ));
4949 private static final int TIMEOUT = 1 ;
50+ private static final int CONNECT_TIMEOUT = 3 ;
5051 private static final int FAILOVER_TIMEOUT_MS = 40000 ;
5152 private static final List <PerfStatMonitoring > enhancedFailureMonitoringPerfDataList =
5253 new ArrayList <>();
@@ -111,7 +112,7 @@ public void test_FailureDetectionTime_EnhancedMonitoringEnabled(
111112 int sleepDelayMillis )
112113 throws SQLException {
113114 final Properties props = initDefaultPropsNoTimeouts ();
114- props .setProperty ("monitoring-loginTimeout " , Integer .toString (TIMEOUT ));
115+ props .setProperty ("monitoring-connectTimeout " , Integer .toString (TIMEOUT ));
115116 props .setProperty ("monitoring-socketTimeout" , Integer .toString (TIMEOUT ));
116117 // this performance test measures efm failure detection time after disconnecting the network
117118 props .setProperty ("failureDetectionTime" , Integer .toString (detectionTime ));
@@ -136,8 +137,11 @@ public void test_FailureDetectionTime_FailoverAndEnhancedMonitoringEnabled(
136137 int sleepDelayMillis )
137138 throws SQLException {
138139 final Properties props = initDefaultPropsNoTimeouts ();
139- props .setProperty ("monitoring-loginTimeout " , Integer .toString (TIMEOUT ));
140+ props .setProperty ("monitoring-connectTimeout " , Integer .toString (TIMEOUT ));
140141 props .setProperty ("monitoring-socketTimeout" , Integer .toString (TIMEOUT ));
142+ props .setProperty ("socketTimeout" , Integer .toString (TIMEOUT ));
143+ props .setProperty ("connectTimeout" , Integer .toString (CONNECT_TIMEOUT ));
144+
141145 // this performance test measures failover and efm failure detection time after disconnecting the network
142146 props .setProperty ("failureDetectionTime" , Integer .toString (detectionTime ));
143147 props .setProperty ("failureDetectionInterval" , Integer .toString (detectionInterval ));
@@ -160,6 +164,8 @@ public void test_FailoverTime_SocketTimeout(int socketTimeout, int sleepDelayMil
160164 final Properties props = initDefaultPropsNoTimeouts ();
161165 // this performance test measures how socket timeout changes the overall failover time
162166 props .setProperty ("socketTimeout" , Integer .toString (socketTimeout ));
167+ props .setProperty ("connectTimeout" , Integer .toString (CONNECT_TIMEOUT ));
168+
163169 // Loads just failover plugin; don't load Enhanced Failure Monitoring plugin
164170 props .setProperty ("failoverTimeoutMs" , Integer .toString (FAILOVER_TIMEOUT_MS ));
165171 props .setProperty ("wrapperPlugins" , "failover" );
0 commit comments