openstack
/
fuel-main
Code Issues Proposed changes

Merge "Add timeout for ceph recovery"

This commit is contained in:
Jenkins 2013-12-24 09:24:21 +00:00 committed by Gerrit Code Review
parent 31adf1ead2 8832b6805a
commit 15f575db2d
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fuelweb_test/helpers/checkers.py
View File

@ -22,7 +22,11 @@ logwrap = debug(logger)
@logwrap
def check_ceph_health(ssh):
def check_ceph_health(ssh, recovery_timeout=False):
if recovery_timeout:
logger.debug("Timeout for ceph recovery.")
sleep(300)
# Check Ceph node disk configuration:
disks = ''.join(ssh.execute(
'ceph osd tree | grep osd')['stdout'])

6
fuelweb_test/tests/test_ceph.py
View File

@ -196,14 +196,16 @@ class CephHA(TestBasic):
# Destroy osd-node
self.env.nodes().slaves[5].destroy()
check_ceph_health(self.env.get_ssh_to_remote_by_name('slave-01'))
check_ceph_health(self.env.get_ssh_to_remote_by_name('slave-01'),
recovery_timeout=True)
self.fuel_web.run_ostf(
cluster_id=cluster_id,
should_fail=4)
# Destroy compute node
self.env.nodes().slaves[4].destroy()
check_ceph_health(self.env.get_ssh_to_remote_by_name('slave-01'))
check_ceph_health(self.env.get_ssh_to_remote_by_name('slave-01'),
recovery_timeout=True)
self.fuel_web.run_ostf(
cluster_id=cluster_id,
should_fail=4)