From: Sage Weil <sage@redhat.com>
Date: Sat, 22 Jul 2017 19:18:26 +0000 (-0400)
Subject: qa/tasks/ceph_manager: wait_for_all_up -> wait_for_all_osds_up
X-Git-Tag: v12.1.2~63^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=80978dea8a5b6634b49b994ecc25bdaa1a0f64eb;p=ceph.git

qa/tasks/ceph_manager: wait_for_all_up -> wait_for_all_osds_up

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/qa/tasks/ceph_manager.py b/qa/tasks/ceph_manager.py
index 9e2363dfac45..757a7faf23af 100644
--- a/qa/tasks/ceph_manager.py
+++ b/qa/tasks/ceph_manager.py
@@ -806,7 +806,7 @@ class Thrasher:
         while len(self.in_osds) < (self.minin + 1):
             self.in_osd()
         self.log("Waiting for recovery")
-        self.ceph_manager.wait_for_all_up(
+        self.ceph_manager.wait_for_all_osds_up(
             timeout=self.config.get('timeout')
             )
         # now we wait 20s for the pg status to change, if it takes longer,
@@ -2147,7 +2147,7 @@ class CephManager:
         x = self.get_osd_dump()
         return (len(x) == sum([(y['up'] > 0) for y in x]))
 
-    def wait_for_all_up(self, timeout=None):
+    def wait_for_all_osds_up(self, timeout=None):
         """
         When this exits, either the timeout has expired, or all
         osds are up.
@@ -2157,7 +2157,7 @@ class CephManager:
         while not self.are_all_osds_up():
             if timeout is not None:
                 assert time.time() - start < timeout, \
-                    'timeout expired in wait_for_all_up'
+                    'timeout expired in wait_for_all_osds_up'
             time.sleep(3)
         self.log("all up!")
 
diff --git a/qa/tasks/repair_test.py b/qa/tasks/repair_test.py
index 26851e25e3de..ba51ea3485a7 100644
--- a/qa/tasks/repair_test.py
+++ b/qa/tasks/repair_test.py
@@ -288,7 +288,7 @@ def task(ctx, config):
         'repair_test task only accepts a dict for config'
 
     manager = ctx.managers['ceph']
-    manager.wait_for_all_up()
+    manager.wait_for_all_osds_up()
 
     manager.raw_cluster_cmd('osd', 'set', 'noscrub')
     manager.raw_cluster_cmd('osd', 'set', 'nodeep-scrub')
diff --git a/qa/tasks/thrashosds.py b/qa/tasks/thrashosds.py
index 8e09dd6a20b8..dbca056a0860 100644
--- a/qa/tasks/thrashosds.py
+++ b/qa/tasks/thrashosds.py
@@ -199,6 +199,6 @@ def task(ctx, config):
     finally:
         log.info('joining thrashosds')
         thrash_proc.do_join()
-        cluster_manager.wait_for_all_up()
+        cluster_manager.wait_for_all_osds_up()
         cluster_manager.flush_all_pg_stats()
         cluster_manager.wait_for_recovery(config.get('timeout', 360))
diff --git a/qa/tasks/vstart_runner.py b/qa/tasks/vstart_runner.py
index 3f1825122e04..ce729c96b089 100644
--- a/qa/tasks/vstart_runner.py
+++ b/qa/tasks/vstart_runner.py
@@ -910,7 +910,7 @@ def exec_test():
 
         # Wait for OSD to come up so that subsequent injectargs etc will
         # definitely succeed
-        LocalCephCluster(LocalContext()).mon_manager.wait_for_all_up(timeout=30)
+        LocalCephCluster(LocalContext()).mon_manager.wait_for_all_osds_up(timeout=30)
 
     # List of client mounts, sufficient to run the selected tests
     clients = [i.__str__() for i in range(0, max_required_clients)]