misc.wait_until_osds_up(): Check for daemon death

Signed-off-by: Zack Cerza <zack@redhat.com>

diff --git a/teuthology/misc.py b/teuthology/misc.py
index 6600ba88d9e165e0bf1b6f4c91a5337d7ce407fa..7a640f5442440842376bab520fbd34f710a20f78 100644 (file)
--- a/teuthology/misc.py
+++ b/teuthology/misc.py
@@ -911,6 +911,9 @@ def wait_until_osds_up(ctx, cluster, remote, ceph_cluster='ceph'):
     testdir = get_testdir(ctx)
     with safe_while(sleep=6, tries=50) as proceed:
         while proceed():
+            daemons = ctx.daemons.iter_daemons_of_role('osd', ceph_cluster)
+            for daemon in daemons:
+                daemon.check_status()
             r = remote.run(
                 args=[
                     'adjust-ulimits',

diff --git a/teuthology/test/test_misc.py b/teuthology/test/test_misc.py
index 464c90488e5e90a627e31ba2ade582f6cfee15ba..8ac7aa643bd24c1fd602d3fcbfc43f637a4917fb 100644 (file)
--- a/teuthology/test/test_misc.py
+++ b/teuthology/test/test_misc.py
@@ -49,8 +49,11 @@ def test_sh_progress(caplog):
     t2 = datetime.strptime(records[2].asctime.split(',')[0], "%Y-%m-%d %H:%M:%S")
     assert (t2 - t1).total_seconds() > 2
 
+
 def test_wait_until_osds_up():
     ctx = argparse.Namespace()
+    ctx.daemons = Mock()
+    ctx.daemons.iter_daemons_of_role.return_value = list()
     remote = FakeRemote()
 
     class r():