teuthology/orchestra: use reconnect() in ensure_online()

* to avoid testing the connection by sending "true" for every command
  sent to remote.
* to reset the connection in ensure_online() to make sure a new
  connection is used

Signed-off-by: Kefu Chai <kchai@redhat.com>

diff --git a/teuthology/misc.py b/teuthology/misc.py
index 45ddcbd6014c9c27ad81cb31b950217a129c8dd1..d3fec6e7ed23695d0242cdc94fd6edaaebec531e 100644 (file)
--- a/teuthology/misc.py
+++ b/teuthology/misc.py
@@ -917,7 +917,7 @@ def reboot(node, timeout=300, interval=30):
     reboot_start_time = time.time()
     while time.time() - reboot_start_time < timeout:
         time.sleep(interval)
-        if node.is_online or node.reconnect():
+        if node.is_online(do_test=True) or node.reconnect():
             return
     raise RuntimeError(
         "{host} did not come up after reboot within {time}s".format(

diff --git a/teuthology/orchestra/remote.py b/teuthology/orchestra/remote.py
index aa57b8ed28fe6d0ddab65a38024a04320f434c82..6f2bd1435071e13fe85b473d909f5e58f9f9497b 100644 (file)
--- a/teuthology/orchestra/remote.py
+++ b/teuthology/orchestra/remote.py
@@ -98,7 +98,7 @@ class Remote(object):
         log.info("Trying to reconnect to host")
         try:
             self.connect(timeout=timeout, context='reconnect')
-            return self.is_online
+            return self.is_online(do_test=True)
         except Exception as e:
             log.debug(e)
             return False
@@ -158,23 +158,22 @@ class Remote(object):
             self._shortname = host_shortname(self.hostname)
         return self._shortname
 
-    @property
-    def is_online(self):
+    def is_online(self, do_test):
         if self.ssh is None:
             return False
         if self.ssh.get_transport() is None:
             return False
-        try:
-            self._runner(args="true", client=self.ssh, name=self.shortname)
-        except Exception:
-            return False
+        if do_test:
+            try:
+                self._runner(args="true", client=self.ssh, name=self.shortname)
+            except Exception:
+                return False
         return self.ssh.get_transport().is_active()
 
     def ensure_online(self):
-        if self.is_online:
+        if self.is_online(do_test=False):
             return
-        self.connect()
-        if not self.is_online:
+        if not self.reconnect()
             raise Exception('unable to connect')
 
     @property