RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-01 08:32:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

qa/tasks/ceph_manager: wait_for_all_up -> wait_for_all_osds_up

Browse Source 
Signed-off-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2017-07-22 15:18:26 -04:00
parent 7648894e55
commit 80978dea8a
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
qa/tasks/ceph_manager.py
View File

@ -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!")

2
qa/tasks/repair_test.py
View File

@ -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')

2
qa/tasks/thrashosds.py
View File

@ -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))

2
qa/tasks/vstart_runner.py
View File

@ -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)]