From: Sage Weil <sage@redhat.com>
Date: Fri, 26 May 2017 13:23:13 +0000 (-0400)
Subject: qa/tasks/ceph: raise an exception if pgs are not clean
X-Git-Tag: v12.1.0~107^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0d80c8866735dd3fc3f321b14a3e53e82c429dbe;p=ceph.git

qa/tasks/ceph: raise an exception if pgs are not clean

If this happens the preceding test should have cleaned
up (e.g., ceph.healthy:).

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/qa/tasks/ceph.py b/qa/tasks/ceph.py
index 4eb49fce8846..56547bdfb9f9 100644
--- a/qa/tasks/ceph.py
+++ b/qa/tasks/ceph.py
@@ -1044,8 +1044,7 @@ def osd_scrub_pgs(ctx, config):
         log.info("Waiting for all osds to be active and clean.")
         time.sleep(delays)
     if not all_clean:
-        log.info("Scrubbing terminated -- not all pgs were active and clean.")
-        return
+        raise RuntimeError("Scrubbing terminated -- not all pgs were active and clean.")
     check_time_now = time.localtime()
     time.sleep(1)
     all_roles = teuthology.all_roles(ctx.cluster)