Merge pull request #130 from isi-adas/BR_PSCALE_176731

Changes in connect function

pike/__init__.py

@@ -13,5 +13,5 @@
         'test',
         'transport',
 ]
-__version_info__ = (0, 2, 27)
+__version_info__ = (0, 2, 28)
 __version__ = "{0}.{1}.{2}".format(*__version_info__)

pike/model.py

@@ -53,6 +53,7 @@
 import time
 import operator
 import contextlib
+import polling2
 
 import auth
 import core
@@ -329,7 +330,7 @@ def unregister_callback(self, event, cb):
             return
         self.callbacks[ev].remove(cb)
 
-    def connect(self, server, port=445):
+    def connect(self, server, port=445, max_tries=2):
         """
         Create a connection.
 
@@ -338,7 +339,15 @@ def connect(self, server, port=445):
         @param server: The server to connect to.
         @param port: The port to connect to.
         """
-        return self.connect_submit(server, port).result()
+        # Setting connection timeout to TCP default i.e. 120 secs
+        conn = polling2.poll(
+            lambda: self.connect_submit(server, port).result(timeout=default_timeout * 4),
+            ignore_exceptions=(ResponseError, TimeoutError,),
+            step=30,
+            max_tries=max_tries,
+        )
+        return conn
+
 
     def connect_submit(self, server, port=445):
         """

pike/test/__init__.py

@@ -128,15 +128,15 @@ def set_client_dialect(self, min_dialect=None, max_dialect=None,
             client.dialects = filter(
                 lambda d: d <= max_dialect, client.dialects)
 
-    def tree_connect(self, client=None, resume=None):
+    def tree_connect(self, client=None, resume=None, max_tries=2):
         dialect_range = self.required_dialect()
         req_caps = self.required_capabilities()
         req_share_caps = self.required_share_capabilities()
 
         if client is None:
             client = self.default_client
 
-        conn = client.connect(self.server, self.port).negotiate()
+        conn = client.connect(self.server, self.port, max_tries=max_tries).negotiate()
 
         if (conn.negotiate_response.dialect_revision < dialect_range[0] or
             conn.negotiate_response.dialect_revision > dialect_range[1]):

setup.py

@@ -82,7 +82,10 @@ def run_setup(with_extensions):
           author_email='[email protected]',
           url='https://github.com/emc-isilon/pike',
           packages=['pike', 'pike.test'],
-          install_requires=['pycryptodomex'],
+          install_requires=[
+              'pycryptodomex',
+              'polling2'
+          ],
           ext_modules=ext_modules,
           test_suite='setup.pike_suite',
           cmdclass=cmdclass,