Fixed bug when socket is not closed immediately upon failure to

establish a connection to the database (#211).

Author: anthony-tuininga

doc/src/release_notes.rst

@@ -51,6 +51,9 @@ Thin Mode Changes
 #)  Fixed bug when an Application Continuity replay context is returned during
     connection to the database
     (`issue 176 <https://github.com/oracle/python-oracledb/issues/176>`__).
+#)  Fixed bug when socket is not closed immediately upon failure to establish a
+    connection to the database
+    (`issue 211 <https://github.com/oracle/python-oracledb/issues/211>`__).
 
 Thick Mode Changes
 ++++++++++++++++++

src/oracledb/impl/thin/connection.pyx

@@ -324,14 +324,18 @@ cdef class ThinConnImpl(BaseConnImpl):
     def connect(self, ConnectParamsImpl params):
         params._check_credentials()
         self._connection_id = base64.b64encode(secrets.token_bytes(16)).decode()
-        self._connect_with_params(params)
-        self._statement_cache = collections.OrderedDict()
-        self._statement_cache_size = params.stmtcachesize
-        self._statement_cache_lock = threading.Lock()
-        self._dbobject_type_cache_num = create_new_dbobject_type_cache(self)
-        self._cursors_to_close = array.array('I')
-        array.resize(self._cursors_to_close, TNS_MAX_CURSORS_TO_CLOSE)
-        self.invoke_session_callback = True
+        try:
+            self._connect_with_params(params)
+            self._statement_cache = collections.OrderedDict()
+            self._statement_cache_size = params.stmtcachesize
+            self._statement_cache_lock = threading.Lock()
+            self._dbobject_type_cache_num = create_new_dbobject_type_cache(self)
+            self._cursors_to_close = array.array('I')
+            array.resize(self._cursors_to_close, TNS_MAX_CURSORS_TO_CLOSE)
+            self.invoke_session_callback = True
+        except:
+            self._force_close()
+            raise
 
     def create_cursor_impl(self):
         return ThinCursorImpl.__new__(ThinCursorImpl, self)

src/oracledb/impl/thin/protocol.pyx

@@ -340,17 +340,18 @@ cdef class Protocol:
         Forces the connection closed. This is used when an unrecoverable error
         has taken place.
         """
-        sock = self._socket
-        if DEBUG_PACKETS:
-            now = datetime.datetime.now()
-            print(now.isoformat(sep=" ", timespec="milliseconds"),
-                  f"[socket: {sock.fileno()}]", "force closing connection")
-            print()
-        self._socket = None
-        self._read_buf._socket = None
-        self._write_buf._socket = None
-        sock.shutdown(socket.SHUT_RDWR)
-        sock.close()
+        if self._socket is not None:
+            sock = self._socket
+            if DEBUG_PACKETS:
+                now = datetime.datetime.now()
+                print(now.isoformat(sep=" ", timespec="milliseconds"),
+                      f"[socket: {sock.fileno()}]", "force closing connection")
+                print()
+            self._socket = None
+            self._read_buf._socket = None
+            self._write_buf._socket = None
+            sock.shutdown(socket.SHUT_RDWR)
+            sock.close()
 
     cdef int _process_message(self, Message message) except -1:
         try: