add wait to thread join

Author: joyc-bq

aws_advanced_python_wrapper/driver_dialect.py

@@ -44,6 +44,7 @@ class DriverDialect(ABC):
     _read_only: bool = False
     _autocommit: bool = False
     _driver_name: str = "Generic"
+    _query: str = "SELECT 1"
 
     def __init__(self, props: Properties):
         self._props = props
@@ -156,7 +157,7 @@ def transfer_session_state(self, from_conn: Connection, to_conn: Connection):
     def ping(self, conn: Connection) -> bool:
         try:
             with conn.cursor() as cursor:
-                query = "SELECT 1"
+                query = _QUERY
                 self.execute("Cursor.execute", lambda: cursor.execute(query), query, exec_timeout=10)
                 cursor.fetchone()
                 return True

aws_advanced_python_wrapper/fastest_response_strategy_plugin.py

@@ -208,7 +208,7 @@ def is_stopped(self):
 
     def close(self):
         self._is_stopped.set()
-        self._daemon_thread.join()
+        self._daemon_thread.join(5)
         logger.debug("HostResponseTimeMonitor.Stopped", self._host_info.host)
 
     def _get_current_time(self):

aws_advanced_python_wrapper/host_monitoring_plugin.py

@@ -349,6 +349,7 @@ class Monitor:
     _INACTIVE_SLEEP_MS = 100
     _MIN_HOST_CHECK_TIMEOUT_MS = 3000
     _MONITORING_PROPERTY_PREFIX = "monitoring-"
+    _QUERY: str = "SELECT 1"
 
     def __init__(
             self,
@@ -560,7 +561,7 @@ def _is_host_available(self, conn: Connection, timeout_sec: float) -> bool:
     def _execute_conn_check(self, conn: Connection, timeout_sec: float):
         driver_dialect = self._plugin_service.driver_dialect
         with conn.cursor() as cursor:
-            query = "SELECT 1"
+            query = _query
             driver_dialect.execute("Cursor.execute", lambda: cursor.execute(query), query, exec_timeout=timeout_sec)
             cursor.fetchone()
 

aws_advanced_python_wrapper/resources/aws_advanced_python_wrapper_messages.properties

@@ -96,7 +96,7 @@ FailoverPlugin.UnableToConnectToReader=[Failover] Unable to establish SQL connec
 FailoverPlugin.UnableToConnectToWriter=[Failover] Unable to establish SQL connection to the writer instance.
 
 FastestResponseStrategyPlugin.RandomHostSelected=[FastestResponseStrategyPlugin] Fastest host not calculated. Random host selected instead.
-FastestResponseStrategyPlugin.UnsupportedHostSelectorStrategy=[FastestResponseStrategyPlugin] Unsupported host selector strategy: `{}`. To use the fastest response strategy plugin, please ensure the property `reader_host_selector_strategy` is set to `fastest_response`
+FastestResponseStrategyPlugin.UnsupportedHostSelectorStrategy=[FastestResponseStrategyPlugin] Unsupported host selector strategy: '{}'. To use the fastest response strategy plugin, please ensure the property reader_host_selector_strategy is set to fastest_response.
 
 FederatedAuthPlugin.UnhandledException=[FederatedAuthPlugin] Unhandled exception: '{}'
 

docs/examples/MySQLFastestResponseStrategy.py

@@ -42,6 +42,9 @@
         conn.read_only = True
         with conn.cursor() as cursor_1:
             cursor_1.execute("SELECT * FROM bank_test")
+            results = cursor_1.fetchall()
+            for record in results:
+                print(record)
 
         # Switch to writer host
         conn.read_only = False
@@ -50,6 +53,9 @@
         conn.read_only = True
         with conn.cursor() as cursor_2:
             cursor_2.execute("SELECT * FROM bank_test")
+            results = cursor_2.fetchall()
+            for record in results:
+                print(record)
 
         # Tear down
         conn.read_only = False

docs/examples/PGFastestResponseStrategy.py

@@ -42,6 +42,9 @@
         conn.read_only = True
         with conn.cursor() as cursor_1:
             cursor_1.execute("SELECT * FROM bank_test")
+            results = cursor_1.fetchall()
+            for record in results:
+                print(record)
 
         # Switch to writer host
         conn.read_only = False