Fixed handling of errors that take place during the initial socket

creation with multiple addresses/descriptions in the connect string or
with retry_count > 0.

Author: anthony-tuininga

src/oracledb/impl/thin/connection.pyx

@@ -66,6 +66,10 @@ cdef class ThinConnImpl(BaseConnImpl):
         uint32_t _call_timeout
         str _cclass
 
+    def __init__(self, str dsn, ConnectParamsImpl params):
+        BaseConnImpl.__init__(self, dsn, params)
+        self._protocol = Protocol()
+
     cdef int _add_cursor_to_close(self, Statement stmt) except -1:
         if self._num_cursors_to_close == TNS_MAX_CURSORS_TO_CLOSE:
             raise Exception("too many cursors to close!")
@@ -224,7 +228,7 @@ cdef class ThinConnImpl(BaseConnImpl):
             self._drcp_enabled = description.server_type == "pooled"
             if self._cclass is None:
                 self._cclass = description.cclass
-            self._protocol = Protocol(sock)
+            self._protocol._set_socket(sock)
             redirect_params = self._protocol._connect_phase_one(self, params,
                                                                 description,
                                                                 address)

src/oracledb/impl/thin/protocol.pyx

@@ -42,16 +42,14 @@ cdef class Protocol:
         bint _txn_in_progress
         bint _break_in_progress
 
-    def __init__(self, sock):
+    def __init__(self):
         self._caps = Capabilities()
-        self.__set_socket(sock)
+        # mark protocol to indicate that connect is in progress; this prevents
+        # the normal break/reset mechanism from firing, which is unnecessary
+        # since the connection is going to be immediately closed anyway!
+        self._in_connect = True
         self._request_lock = threading.RLock()
 
-    cdef int __set_socket(self, sock):
-         self._socket = sock
-         self._read_buf = ReadBuffer(sock, TNS_SDU, self._caps)
-         self._write_buf = WriteBuffer(sock, TNS_SDU, self._caps)
-
     cdef int _break_external(self) except -1:
         """
         Method for sending a break to the server from an external request. A
@@ -133,11 +131,6 @@ cdef class Protocol:
             uint8_t packet_type
             str connect_string
 
-        # mark protocol to indicate that connect is in progress; this prevents
-        # the normal break/reset mechanism from firing, which is unnecessary
-        # since the connection is going to be immediately closed anyway!
-        self._in_connect = True
-
         # store whether OOB processing is possible or not
         self._caps.supports_oob = not params.disable_oob \
                 and sys.platform != "win32"
@@ -175,7 +168,7 @@ cdef class Protocol:
                     ssl_context.check_hostname = False
                     sock = socket.socket(fileno=self._socket.detach())
                     sock = ssl_context.wrap_socket(sock)
-                    self.__set_socket(sock)
+                    self._set_socket(sock)
 
     cdef int _connect_phase_two(self, ThinConnImpl conn_impl,
                                 Description description,
@@ -370,3 +363,8 @@ cdef class Protocol:
         buf.write_uint8(0)
         buf.write_uint8(marker_type)
         buf.end_request()
+
+    cdef int _set_socket(self, sock):
+         self._socket = sock
+         self._read_buf = ReadBuffer(sock, TNS_SDU, self._caps)
+         self._write_buf = WriteBuffer(sock, TNS_SDU, self._caps)