tests: recovery-unfound-found test needs to account for correct misplaced calculations

The test expected HEALTH_OK when in a state with misplaced objects therefore HEALTH_WARN

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 9f103f013c08bb215f58247f75d33f4f95bb3719)

diff --git a/qa/suites/rados/singleton-nomsgr/all/recovery-unfound-found.yaml b/qa/suites/rados/singleton-nomsgr/all/recovery-unfound-found.yaml
index 6d77cc78a4fd668f4767a2825285c0aef5a22a5e..ce0cbd9f04fd06dc7f9105c043b5a69a24e8847d 100644 (file)
--- a/qa/suites/rados/singleton-nomsgr/all/recovery-unfound-found.yaml
+++ b/qa/suites/rados/singleton-nomsgr/all/recovery-unfound-found.yaml
@@ -50,4 +50,9 @@ tasks:
       - ceph osd out 0
       - sleep 10
       - ceph osd unset noup
+- ceph.healthy:
+      wait-for-healthy: false # only wait for osds up and pgs clean, ignore misplaced
+- exec:
+    osd.0:
+      - ceph osd in 0
 - ceph.healthy:

diff --git a/qa/tasks/ceph.py b/qa/tasks/ceph.py
index 72f265375e1c65157fae44a6e8286fdad691ae20..87cbbc1ff561748a842da97ed38814b6b65d0e76 100644 (file)
--- a/qa/tasks/ceph.py
+++ b/qa/tasks/ceph.py
@@ -1256,12 +1256,13 @@ def healthy(ctx, config):
         log.info('ignoring flush pg stats error, probably testing upgrade: %s', e)
     manager.wait_for_clean()
 
-    log.info('Waiting until ceph cluster %s is healthy...', cluster_name)
-    teuthology.wait_until_healthy(
-        ctx,
-        remote=mon0_remote,
-        ceph_cluster=cluster_name,
-    )
+    if config.get('wait-for-healthy', True):
+        log.info('Waiting until ceph cluster %s is healthy...', cluster_name)
+        teuthology.wait_until_healthy(
+            ctx,
+            remote=mon0_remote,
+            ceph_cluster=cluster_name,
+        )
 
     if ctx.cluster.only(teuthology.is_type('mds', cluster_name)).remotes:
         # Some MDSs exist, wait for them to be healthy