Fixed bug causing hang due to blocked task cancellation during asyncio

loop shutdown.

Author: anthony-tuininga

doc/src/release_notes.rst

@@ -29,6 +29,8 @@ Thin Mode Changes
     :attr:`oracledb.DB_TYPE_TIMESTAMP`, :attr:`oracledb.DB_TYPE_TIMESTAMP_TZ`
     and :attr:`oracledb.DB_TYPE_TIMESTAMP_LTZ`.
 #)  Fixed bug validating the database host during connection.
+#)  Fixed bug causing hang due to blocked task cancellation during
+    :ref:`asyncio <concurrentprogramming>` loop shutdown.
 #)  Internal change: refactor encoding of Oracle data types.
 #)  Internal change: small performance improvement sending bytes on the
     network transport.

src/oracledb/impl/thin/pool.pyx

@@ -720,6 +720,8 @@ cdef class AsyncThinPoolImpl(BaseThinPoolImpl):
             if num_to_create > 0 and self._open:
                 try:
                     conn_impl = await self._create_conn_impl()
+                except asyncio.CancelledError:
+                    raise
                 except:
                     conn_impl = None
                 async with self._condition:
@@ -732,6 +734,8 @@ cdef class AsyncThinPoolImpl(BaseThinPoolImpl):
                     conn_impl = self._conn_impls_to_drop.pop()
                     try:
                         await conn_impl._protocol._close(conn_impl)
+                    except asyncio.CancelledError:
+                        raise
                     except:
                         pass
                     continue

tests/test_2400_pool.py

@@ -1062,3 +1062,10 @@ def test_2457(skip_if_drcp, test_env):
             cursor.execute("select user from dual")
             (user,) = cursor.fetchone()
             assert user == test_env.main_user.upper()
+
+
+def test_2458(test_env):
+    "2458 - connection to database with bad password"
+    pool = test_env.get_pool(password=test_env.main_password + "X")
+    with test_env.assert_raises_full_code("ORA-01017"):
+        pool.acquire()

tests/test_5500_pool_async.py

@@ -677,3 +677,10 @@ async def test_5543(skip_if_drcp, test_env):
             await cursor.execute("select user from dual")
             (user,) = await cursor.fetchone()
             assert user == test_env.main_user.upper()
+
+
+async def test_5544(test_env):
+    "5544 - connection to database with bad password"
+    pool = test_env.get_pool_async(password=test_env.main_password + "X")
+    with test_env.assert_raises_full_code("ORA-01017"):
+        await pool.acquire()