fix: only clear reference if it is an idle connection

Author: karenc-bq

aws_advanced_python_wrapper/read_write_splitting_plugin.py

@@ -402,32 +402,29 @@ def _close_connection_if_idle(self, internal_conn: Optional[Connection]):
         current_conn = self._plugin_service.current_connection
         driver_dialect = self._plugin_service.driver_dialect
 
+        if internal_conn == current_conn:
+            # Connection is in use, do not close
+            return
+
         try:
-            if internal_conn != current_conn and self._is_connection_usable(
-                internal_conn, driver_dialect
-            ):
+            if self._is_connection_usable(internal_conn, driver_dialect):
                 driver_dialect.execute(DbApiMethod.CONNECTION_CLOSE.method_name, lambda: internal_conn.close())
-                if internal_conn == self._writer_connection:
-                    self._writer_connection = None
-                    self._writer_host_info = None
-                if internal_conn == self._reader_connection:
-                    self._reader_connection = None
-                    self._reader_host_info = None
         except Exception:
             # Ignore exceptions during cleanup - connection might already be dead
             pass
+        finally:
+            if internal_conn == self._writer_connection:
+                self._writer_connection = None
+                self._writer_host_info = None
+            if internal_conn == self._reader_connection:
+                self._reader_connection = None
+                self._reader_host_info = None
 
     def _close_idle_connections(self):
         logger.debug("ReadWriteSplittingPlugin.ClosingInternalConnections")
         self._close_connection_if_idle(self._reader_connection)
         self._close_connection_if_idle(self._writer_connection)
 
-        # Always clear cached references even if connections couldn't be closed
-        self._reader_connection = None
-        self._reader_host_info = None
-        self._writer_connection = None
-        self._writer_host_info = None
-
     @staticmethod
     def log_and_raise_exception(log_msg: str):
         logger.error(log_msg)

tests/integration/host/src/test/java/integration/util/ContainerHelper.java

@@ -49,7 +49,7 @@
 
 public class ContainerHelper {
 
-  private static final String MYSQL_CONTAINER_IMAGE_NAME = "mysql:latest";
+  private static final String MYSQL_CONTAINER_IMAGE_NAME = "mysql:lts";
   private static final String POSTGRES_CONTAINER_IMAGE_NAME = "postgres:latest";
   private static final DockerImageName TOXIPROXY_IMAGE =
       DockerImageName.parse("ghcr.io/shopify/toxiproxy:2.12.0");