From: David Zafman <dzafman@redhat.com>
Date: Tue, 16 Jan 2018 18:44:29 +0000 (-0800)
Subject: tests: recovery-unfound-found test needs to account for correct misplaced calculations
X-Git-Tag: v13.0.2~511^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F19850%2Fhead;p=ceph.git

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

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 6d77cc78a4fd..ce0cbd9f04fd 100644
--- 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 177fb0d2db2d..49e6029c8fc2 100644
--- a/qa/tasks/ceph.py
+++ b/qa/tasks/ceph.py
@@ -1267,12 +1267,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