SNOW-27430: added login_timeout and network_timeout parameters to connection. By default, login timeout is 60 seconds and network timeout is infinite.

Author: smtakeda

chunk_downloader.py

@@ -13,7 +13,7 @@
 from .errors import (Error, OperationalError)
 from .network import (SnowflakeRestful, NO_TOKEN, MAX_CONNECTION_POOL)
 
-DEFAULT_REQUEST_TIMEOUT = 300
+DEFAULT_REQUEST_TIMEOUT = 3600
 DEFAULT_CLIENT_RESULT_PREFETCH_SLOTS = 2
 DEFAULT_CLIENT_RESULT_PREFETCH_THREADS = 1
 
@@ -257,8 +257,7 @@ def __del__(self):
     def _get_request(
             self, url, headers,
             is_raw_binary_iterator=True,
-            max_connection_pool=MAX_CONNECTION_POOL,
-            retry=10):
+            max_connection_pool=MAX_CONNECTION_POOL):
         """
         GET request for Large Result set chunkloader
         """
@@ -282,7 +281,6 @@ def _get_request(
             timeout=(self._connection._connect_timeout,
                      self._connection._connect_timeout,
                      DEFAULT_REQUEST_TIMEOUT),
-            retry=retry,
             token=NO_TOKEN,
             is_raw_binary=True,
             is_raw_binary_iterator=is_raw_binary_iterator,

connection.py

@@ -54,8 +54,10 @@
     u'schema': None,  # snowflake
     u'role': None,  # snowflake
     u'session_id': None,  # snowflake
-    u'connect_timeout': None,  # connection timeout
-    u'request_timeout': None,  # request timeout
+    u'connect_timeout': None,  # snowflake internal connection timeout
+    u'request_timeout': None,  # snowflake internalrequest timeout
+    u'login_timeout': 60,  # login timeout
+    u'network_timeout': None,  # network timeout (infinite by default)
     u'passcode_in_password': False,  # Snowflake MFA
     u'passcode': None,  # Snowflake MFA
     u'authenticator': network.DEFAULT_AUTHENTICATOR,
@@ -74,7 +76,6 @@
     u'ocsp_response_cache_filename': None,  # snowflake internal
     u'converter_class': SnowflakeConverter,  # snowflake internal
     u'chunk_downloader_class': SnowflakeChunkDownloader,  # snowflake internal
-    u'retry_connection_auth': True,  # snowflake internal
 }
 
 APPLICATION_RE = re.compile(r'[\w\d_]+')
@@ -201,6 +202,20 @@ def request_timeout(self):
         """
         return self._request_timeout
 
+    @property
+    def login_timeout(self):
+        """
+        Login timeout. Used in authentication
+        """
+        return self._login_timeout
+
+    @property
+    def network_timeout(self):
+        """
+        Network timeout. Used for general purpose
+        """
+        return self._network_timeout
+
     @property
     def rest(self):
         u"""
@@ -452,7 +467,6 @@ def __open_connection(self, mfa_callback, password_callback):
             mfa_callback=mfa_callback,
             password_callback=password_callback,
             session_parameters=self._session_parameters,
-            retry_connection_auth=self._retry_connection_auth,
         )
         self._password = None
         self._token = self._con.token
@@ -564,9 +578,7 @@ def _cmd_query(self, sql, sequence_counter, request_id,
         # retry 1000 times/4.5 hours for general queries
         ret = self._con.request(
             u'/queries/v1/query-request?' + urlencode(url_parameters),
-            data,
-            client=client,
-            _no_results=_no_results, retry=1000)
+            data, client=client, _no_results=_no_results)
 
         if ret is not None and u'data' in ret and ret[u'data'] is None:
             ret[u'data'] = {}

cursor.py

@@ -578,9 +578,7 @@ def chunk_info(self, data, use_ijson=False):
 
     def query_result(self, qid, _use_ijson=False):
         url = ('/queries/{qid}/result').format(qid=qid)
-        # retry 1000 times for getting the results
-        ret = self._connection._con.request(
-            url=url, method='get', retry=1000)
+        ret = self._connection._con.request(url=url, method='get')
         if ret.get(u'success'):
             data = ret.get(u'data')
             self.chunk_info(data, use_ijson=_use_ijson)
@@ -603,9 +601,8 @@ def query_result(self, qid, _use_ijson=False):
         return self
 
     def abort_query(self, qid):
-        url = ('/queries/{qid}/abort-request').format(qid=qid)
-        ret = self._connection._con.request(
-            url=url, method='post', retry=100)
+        url = '/queries/{qid}/abort-request'.format(qid=qid)
+        ret = self._connection._con.request(url=url, method='post')
         return ret.get(u'success')
 
     def executemany(self, command, seqparams):