Skip to content

Commit ad3d3d1

Browse files
karenc-bqkarenc-bq
committed
chore: address review comment
1 parent 0bd677b commit ad3d3d1

File tree

3 files changed

+33
-33
lines changed

3 files changed

+33
-33
lines changed

Diff for: ‎aws_advanced_python_wrapper/aurora_initial_connection_strategy_plugin.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -67,17 +67,17 @@ def force_connect(self, target_driver_func: Callable, driver_dialect: DriverDial
6767
return self._connect_internal(host_info, props, is_initial_connection, force_connect_func)
6868

6969
def _connect_internal(self, host_info: HostInfo, props: Properties, is_initial_connection: bool, connect_func: Callable) -> Connection:
70-
urlType: RdsUrlType = self._rds_utils.identify_rds_type(host_info.host)
71-
if not urlType.is_rds_cluster:
70+
url_type: RdsUrlType = self._rds_utils.identify_rds_type(host_info.host)
71+
if not url_type.is_rds_cluster:
7272
return connect_func()
7373

74-
if urlType == RdsUrlType.RDS_WRITER_CLUSTER:
74+
if url_type == RdsUrlType.RDS_WRITER_CLUSTER:
7575
writer_candidate_conn = self._get_verified_writer_connection(props, is_initial_connection, connect_func)
7676
if writer_candidate_conn is None:
7777
return connect_func()
7878
return writer_candidate_conn
7979

80-
if urlType == RdsUrlType.RDS_READER_CLUSTER:
80+
if url_type == RdsUrlType.RDS_READER_CLUSTER:
8181
reader_candidate_conn = self._get_verified_reader_connection(props, is_initial_connection, connect_func)
8282
if reader_candidate_conn is None:
8383
return connect_func()

Diff for: ‎aws_advanced_python_wrapper/profiles/driver_configuration_profiles.py

+28-28
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@ class DriverConfigurationProfiles:
6767
plugin_factories=[HostMonitoringPluginFactory()],
6868
properties=Properties({WrapperProperties.CONNECT_TIMEOUT_SEC.name: 10,
6969
WrapperProperties.SOCKET_TIMEOUT_SEC.name: 0,
70-
WrapperProperties.FAILURE_DETECTION_COUNT: 5,
71-
WrapperProperties.FAILURE_DETECTION_TIME_MS: 60000,
72-
WrapperProperties.FAILURE_DETECTION_INTERVAL_MS: 15000,
70+
WrapperProperties.FAILURE_DETECTION_COUNT.name: 5,
71+
WrapperProperties.FAILURE_DETECTION_TIME_MS.name: 60000,
72+
WrapperProperties.FAILURE_DETECTION_INTERVAL_MS.name: 15000,
7373
WrapperProperties.TCP_KEEPALIVE.name: False,
7474
"autocommit": True})
7575
),
@@ -78,11 +78,11 @@ class DriverConfigurationProfiles:
7878
plugin_factories=[HostMonitoringPluginFactory()],
7979
properties=Properties({WrapperProperties.CONNECT_TIMEOUT_SEC.name: 10,
8080
WrapperProperties.SOCKET_TIMEOUT_SEC.name: 0,
81-
WrapperProperties.FAILURE_DETECTION_COUNT: 5,
82-
WrapperProperties.FAILURE_DETECTION_TIME_MS: 30000,
83-
WrapperProperties.FAILURE_DETECTION_INTERVAL_MS: 5000,
84-
"monitoring-" + WrapperProperties.CONNECT_TIMEOUT_SEC: 3,
85-
"monitoring-" + WrapperProperties.SOCKET_TIMEOUT_SEC: 3,
81+
WrapperProperties.FAILURE_DETECTION_COUNT.name: 5,
82+
WrapperProperties.FAILURE_DETECTION_TIME_MS.name: 30000,
83+
WrapperProperties.FAILURE_DETECTION_INTERVAL_MS.name: 5000,
84+
"monitoring-" + WrapperProperties.CONNECT_TIMEOUT_SEC.name: 3,
85+
"monitoring-" + WrapperProperties.SOCKET_TIMEOUT_SEC.name: 3,
8686
WrapperProperties.TCP_KEEPALIVE.name: False,
8787
"autocommit": True})
8888
),
@@ -128,11 +128,11 @@ class DriverConfigurationProfiles:
128128
ReadWriteSplittingPluginFactory(), FailoverPluginFactory(), HostMonitoringPluginFactory()],
129129
properties=Properties({WrapperProperties.CONNECT_TIMEOUT_SEC.name: 10,
130130
WrapperProperties.SOCKET_TIMEOUT_SEC.name: 0,
131-
WrapperProperties.FAILURE_DETECTION_COUNT: 5,
132-
WrapperProperties.FAILURE_DETECTION_TIME_MS: 60000,
133-
WrapperProperties.FAILURE_DETECTION_INTERVAL_MS: 15000,
134-
"monitoring-" + WrapperProperties.CONNECT_TIMEOUT_SEC: 10,
135-
"monitoring-" + WrapperProperties.SOCKET_TIMEOUT_SEC: 5,
131+
WrapperProperties.FAILURE_DETECTION_COUNT.name: 5,
132+
WrapperProperties.FAILURE_DETECTION_TIME_MS.name: 60000,
133+
WrapperProperties.FAILURE_DETECTION_INTERVAL_MS.name: 15000,
134+
"monitoring-" + WrapperProperties.CONNECT_TIMEOUT_SEC.name: 10,
135+
"monitoring-" + WrapperProperties.SOCKET_TIMEOUT_SEC.name: 5,
136136
WrapperProperties.TCP_KEEPALIVE.name: False,
137137
"autocommit": True}),
138138
connection_provider=SqlAlchemyPooledConnectionProvider(lambda _, __: {"pool_size": 30,
@@ -145,11 +145,11 @@ class DriverConfigurationProfiles:
145145
ReadWriteSplittingPluginFactory(), FailoverPluginFactory(), HostMonitoringPluginFactory()],
146146
properties=Properties({WrapperProperties.CONNECT_TIMEOUT_SEC.name: 10,
147147
WrapperProperties.SOCKET_TIMEOUT_SEC.name: 0,
148-
WrapperProperties.FAILURE_DETECTION_COUNT: 5,
149-
WrapperProperties.FAILURE_DETECTION_TIME_MS: 30000,
150-
WrapperProperties.FAILURE_DETECTION_INTERVAL_MS: 5000,
151-
"monitoring-" + WrapperProperties.CONNECT_TIMEOUT_SEC: 3,
152-
"monitoring-" + WrapperProperties.SOCKET_TIMEOUT_SEC: 3,
148+
WrapperProperties.FAILURE_DETECTION_COUNT.name: 5,
149+
WrapperProperties.FAILURE_DETECTION_TIME_MS.name: 30000,
150+
WrapperProperties.FAILURE_DETECTION_INTERVAL_MS.name: 5000,
151+
"monitoring-" + WrapperProperties.CONNECT_TIMEOUT_SEC.name: 3,
152+
"monitoring-" + WrapperProperties.SOCKET_TIMEOUT_SEC.name: 3,
153153
WrapperProperties.TCP_KEEPALIVE.name: False,
154154
"autocommit": True}),
155155
connection_provider=SqlAlchemyPooledConnectionProvider(lambda _, __: {"pool_size": 30,
@@ -188,11 +188,11 @@ class DriverConfigurationProfiles:
188188
HostMonitoringPluginFactory()],
189189
properties=Properties({WrapperProperties.CONNECT_TIMEOUT_SEC.name: 10,
190190
WrapperProperties.SOCKET_TIMEOUT_SEC.name: 0,
191-
WrapperProperties.FAILURE_DETECTION_COUNT: 5,
192-
WrapperProperties.FAILURE_DETECTION_TIME_MS: 60000,
193-
WrapperProperties.FAILURE_DETECTION_INTERVAL_MS: 15000,
194-
"monitoring-" + WrapperProperties.CONNECT_TIMEOUT_SEC: 10,
195-
"monitoring-" + WrapperProperties.SOCKET_TIMEOUT_SEC: 3,
191+
WrapperProperties.FAILURE_DETECTION_COUNT.name: 5,
192+
WrapperProperties.FAILURE_DETECTION_TIME_MS.name: 60000,
193+
WrapperProperties.FAILURE_DETECTION_INTERVAL_MS.name: 15000,
194+
"monitoring-" + WrapperProperties.CONNECT_TIMEOUT_SEC.name: 10,
195+
"monitoring-" + WrapperProperties.SOCKET_TIMEOUT_SEC.name: 3,
196196
WrapperProperties.TCP_KEEPALIVE.name: False,
197197
"autocommit": True})
198198
),
@@ -204,11 +204,11 @@ class DriverConfigurationProfiles:
204204
HostMonitoringPluginFactory()],
205205
properties=Properties({WrapperProperties.CONNECT_TIMEOUT_SEC.name: 10,
206206
WrapperProperties.SOCKET_TIMEOUT_SEC.name: 0,
207-
WrapperProperties.FAILURE_DETECTION_COUNT: 3,
208-
WrapperProperties.FAILURE_DETECTION_TIME_MS: 30000,
209-
WrapperProperties.FAILURE_DETECTION_INTERVAL_MS: 5000,
210-
"monitoring-" + WrapperProperties.CONNECT_TIMEOUT_SEC: 3,
211-
"monitoring-" + WrapperProperties.SOCKET_TIMEOUT_SEC: 3,
207+
WrapperProperties.FAILURE_DETECTION_COUNT.name: 3,
208+
WrapperProperties.FAILURE_DETECTION_TIME_MS.name: 30000,
209+
WrapperProperties.FAILURE_DETECTION_INTERVAL_MS.name: 5000,
210+
"monitoring-" + WrapperProperties.CONNECT_TIMEOUT_SEC.name: 3,
211+
"monitoring-" + WrapperProperties.SOCKET_TIMEOUT_SEC.name: 3,
212212
WrapperProperties.TCP_KEEPALIVE.name: False,
213213
"autocommit": True})
214214
)

Diff for: ‎aws_advanced_python_wrapper/utils/properties.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ class WrapperProperties:
326326
"random")
327327

328328
OPEN_CONNECTION_RETRY_TIMEOUT_MS = WrapperProperty("open_connection_retry_timeout_ms",
329-
"Maximum allowed time for the retries opening a connection.", 30_000)
329+
"Maximum allowed time in milliseconds for the retries opening a connection.", 30_000)
330330
OPEN_CONNECTION_RETRY_INTERVAL_MS = WrapperProperty("open_connection_retry_interval_ms", "Time between each retry of opening a connection.", 1000)
331331

332332

0 commit comments

Comments
 (0)