From 868566000a8d5bb1529173a9f57d89bb01411185 Mon Sep 17 00:00:00 2001 From: asledzinskiy Date: Fri, 4 Apr 2014 17:36:38 +0300 Subject: [PATCH] Added wait to check if ceph is recovered Change-Id: Icda21377253dddb70e9264827240fd6b19363d83 Closes-Bug: #1302554 --- fuelweb_test/helpers/checkers.py | 10 ++++++---- fuelweb_test/tests/tests_strength/test_restart.py | 6 ++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/fuelweb_test/helpers/checkers.py b/fuelweb_test/helpers/checkers.py index e42306800..040ef911a 100644 --- a/fuelweb_test/helpers/checkers.py +++ b/fuelweb_test/helpers/checkers.py @@ -18,6 +18,7 @@ from fuelweb_test import logwrap from proboscis.asserts import assert_equal from proboscis.asserts import assert_false from proboscis.asserts import assert_true +from devops.helpers.helpers import wait import os from time import sleep @@ -25,10 +26,11 @@ import urllib @logwrap -def check_ceph_health(ssh, recovery_timeout=False): - if recovery_timeout: - logger.debug("Timeout for ceph recovery.") - sleep(300) +def check_ceph_health(ssh): + wait( + lambda: 'HEALTH_OK' in ''.join(ssh.execute('ceph -s')['stdout']), + interval=120, + timeout=360) # Check Ceph node disk configuration: disks = ''.join(ssh.execute( diff --git a/fuelweb_test/tests/tests_strength/test_restart.py b/fuelweb_test/tests/tests_strength/test_restart.py index bf86bfc51..309e39ea3 100644 --- a/fuelweb_test/tests/tests_strength/test_restart.py +++ b/fuelweb_test/tests/tests_strength/test_restart.py @@ -133,16 +133,14 @@ class CephHARestart(TestBasic): # Destroy osd-node self.env.nodes().slaves[5].destroy() - check_ceph_health(self.env.get_ssh_to_remote_by_name('slave-01'), - recovery_timeout=True) + check_ceph_health(self.env.get_ssh_to_remote_by_name('slave-01')) self.fuel_web.run_ostf( cluster_id=cluster_id, should_fail=0) # Destroy compute node self.env.nodes().slaves[4].destroy() - check_ceph_health(self.env.get_ssh_to_remote_by_name('slave-01'), - recovery_timeout=True) + check_ceph_health(self.env.get_ssh_to_remote_by_name('slave-01')) self.fuel_web.run_ostf(cluster_id=cluster_id) # Cold restart