From: Sage Weil <sage@redhat.com>
Date: Fri, 26 May 2017 13:24:03 +0000 (-0400)
Subject: qa/tasks/ceph: raise exception if scrubs time out
X-Git-Tag: v12.1.0~107^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=200abcee6dbcf9be577bc85e873bd38c566d836d;p=ceph.git

qa/tasks/ceph: raise exception if scrubs time out

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

diff --git a/qa/tasks/ceph.py b/qa/tasks/ceph.py
index 56547bdfb9f9..7f95bbca65c5 100644
--- a/qa/tasks/ceph.py
+++ b/qa/tasks/ceph.py
@@ -1073,8 +1073,7 @@ def osd_scrub_pgs(ctx, config):
         else:
             gap_cnt += 1
             if gap_cnt > retries:
-                log.info('Exiting scrub checking -- not all pgs scrubbed.')
-                return
+                raise RuntimeError('Exiting scrub checking -- not all pgs scrubbed.')
         if loop:
             log.info('Still waiting for all pgs to be scrubbed.')
             time.sleep(delays)