Fixed bug which caused Connection.call_timeout to be reset to zero when

a ping is internally executed by the pool before the connection is
returned to the user (#558).

Author: anthony-tuininga

doc/src/release_notes.rst

@@ -19,6 +19,10 @@ oracledb `3.5.0 <https://github.com/oracle/python-oracledb/compare/v3.4.1...v3.5
 Thin Mode Changes
 +++++++++++++++++
 
+#)  Fixed bug which caused :data:`Connection.call_timeout` to be reset to zero
+    when a ping is internally executed by the pool before the connection is
+    returned to the user
+    (`issue 558 <https://github.com/oracle/python-oracledb/issues/558>`__).
 #)  Fixed bug when decoding PL/SQL booleans in Oracle Database 12.1
     (`issue 565 <https://github.com/oracle/python-oracledb/issues/565>`__).
 #)  Fixed bug when a :ref:`DbObject <dbobject>` instance contains an attribute

src/oracledb/impl/thin/pool.pyx

@@ -579,13 +579,16 @@ cdef class ThinPoolImpl(BaseThinPoolImpl):
         """
         Processes a request.
         """
-        cdef BaseThinConnImpl conn_impl
+        cdef:
+            BaseThinConnImpl conn_impl
+            uint32_t orig_call_timeout
         try:
             if request.requires_ping:
                 try:
+                    orig_call_timeout = request.conn_impl._call_timeout
                     request.conn_impl.set_call_timeout(self._ping_timeout)
                     request.conn_impl.ping()
-                    request.conn_impl.set_call_timeout(0)
+                    request.conn_impl.set_call_timeout(orig_call_timeout)
                 except exceptions.Error:
                     request.conn_impl._protocol._disconnect()
                     request.conn_impl = None
@@ -772,13 +775,16 @@ cdef class AsyncThinPoolImpl(BaseThinPoolImpl):
         """
         Processes a request.
         """
-        cdef BaseThinConnImpl conn_impl
+        cdef:
+            BaseThinConnImpl conn_impl
+            uint32_t orig_call_timeout
         try:
             if request.requires_ping:
                 try:
+                    orig_call_timeout = request.conn_impl._call_timeout
                     request.conn_impl.set_call_timeout(self._ping_timeout)
                     await request.conn_impl.ping()
-                    request.conn_impl.set_call_timeout(0)
+                    request.conn_impl.set_call_timeout(orig_call_timeout)
                 except exceptions.Error:
                     request.conn_impl._protocol._disconnect()
                     request.conn_impl = None

tests/test_2400_pool.py

@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
+# Copyright (c) 2020, 2026, Oracle and/or its affiliates.
 #
 # This software is dual-licensed to you under the Universal Permissive License
 # (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
@@ -1110,3 +1110,18 @@ def test_2458(test_env):
     with test_env.assert_raises_full_code("ORA-01017"):
         pool = test_env.get_pool(password=test_env.main_password + "X")
         pool.acquire()
+
+
+def test_2459(test_env):
+    "2459 - verify call_timeout is unchanged after internal ping performed"
+    desired_value = 5000
+
+    def callback(conn, tag):
+        conn.call_timeout = desired_value
+
+    pool = test_env.get_pool(session_callback=callback, ping_interval=0)
+    with pool.acquire() as conn:
+        assert conn.call_timeout == desired_value
+    with pool.acquire() as conn:
+        assert conn.call_timeout == desired_value
+    pool.close()

tests/test_5500_pool_async.py

@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# Copyright (c) 2023, 2025, Oracle and/or its affiliates.
+# Copyright (c) 2023, 2026, Oracle and/or its affiliates.
 #
 # This software is dual-licensed to you under the Universal Permissive License
 # (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
@@ -684,3 +684,18 @@ async def test_5544(test_env):
     pool = test_env.get_pool_async(password=test_env.main_password + "X")
     with test_env.assert_raises_full_code("ORA-01017"):
         await pool.acquire()
+
+
+async def test_5545(test_env):
+    "5545 - verify call_timeout is unchanged after internal ping performed"
+    desired_value = 5000
+
+    async def callback(conn, tag):
+        conn.call_timeout = desired_value
+
+    pool = test_env.get_pool_async(session_callback=callback, ping_interval=0)
+    async with pool.acquire() as conn:
+        assert conn.call_timeout == desired_value
+    async with pool.acquire() as conn:
+        assert conn.call_timeout == desired_value
+    await pool.close()