From: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
Date: Mon, 4 Feb 2019 20:08:26 +0000 (+0100)
Subject: orchestra: fix retry and socket timeouts misconception
X-Git-Tag: 1.1.0~270^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F1255%2Fhead;p=teuthology.git

orchestra: fix retry and socket timeouts misconception

Fix retry and socket timeouts misconception for reconnect.
Add default sleep time as argument to the signature.

Signed-off-by: Kyr <kyrylo.shatskyy@gmail.com>
---

diff --git a/teuthology/orchestra/remote.py b/teuthology/orchestra/remote.py
index 8f9e318fc..0dde83f97 100644
--- a/teuthology/orchestra/remote.py
+++ b/teuthology/orchestra/remote.py
@@ -61,7 +61,7 @@ class Remote(object):
         self.ssh = connection.connect(**args)
         return self.ssh
 
-    def reconnect(self, timeout=None):
+    def reconnect(self, timeout=None, socket_timeout=None, sleep_time=30):
         """
         Attempts to re-establish connection. Returns True for success; False
         for failure.
@@ -69,17 +69,16 @@ class Remote(object):
         if self.ssh is not None:
             self.ssh.close()
         if not timeout:
-            return self._reconnect(timeout=timeout)
+            return self._reconnect(timeout=socket_timeout)
         start_time = time.time()
         elapsed_time = lambda: time.time() - start_time
         while elapsed_time() < timeout:
-            success = self._reconnect()
+            success = self._reconnect(timeout=socket_timeout)
             if success:
                 break
-            default_sleep_val = 30
             # Don't let time_remaining be < 0
             time_remaining = max(0, timeout - elapsed_time())
-            sleep_val = min(time_remaining, default_sleep_val)
+            sleep_val = min(time_remaining, sleep_time)
             time.sleep(sleep_val)
         return success