From: Zack Cerza <zack@cerza.org>
Date: Wed, 12 Feb 2014 17:08:25 +0000 (-0600)
Subject: Make reconnect() use Remote.reconnect()
X-Git-Tag: v0.94.10~27^2^2~364^2~356^2~16
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e3f336d15b0c0e338ea61783a02e6e5d14b230e5;p=ceph.git

Make reconnect() use Remote.reconnect()

Signed-off-by: Zack Cerza <zack.cerza@inktank.com>
---

diff --git a/teuthology/misc.py b/teuthology/misc.py
index ea61c1208f31b..280cee4b28701 100644
--- a/teuthology/misc.py
+++ b/teuthology/misc.py
@@ -938,23 +938,14 @@ def reconnect(ctx, timeout, remotes=None):
     else:
         need_reconnect = ctx.cluster.remotes.keys()
 
-    for r in need_reconnect:
-        r.ssh.close()
-
     while need_reconnect:
         for remote in need_reconnect:
-            try:
-                log.info('trying to connect to %s', remote.name)
-                key = ctx.config['targets'][remote.name]
-                from .orchestra import connection
-                remote.ssh = connection.connect(
-                    user_at_host=remote.name,
-                    host_key=key,
-                    keep_alive=True,
-                    )
-            except Exception:
+            log.info('trying to connect to %s', remote.name)
+            success = remote.reconnect()
+            if not success:
                 if time.time() - starttime > timeout:
-                    raise
+                    raise RuntimeError("Could not reconnect to %s" %
+                                       remote.name)
             else:
                 need_reconnect.remove(remote)