From: Sage Weil <sage@redhat.com>
Date: Fri, 17 Nov 2017 16:20:40 +0000 (-0600)
Subject: qa/tasks/ceph: disable osd_debug_deep_scrub_sleep in case it is set
X-Git-Tag: v12.2.6~98^2~28
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f8a7b7c885097fe92b9a4019fdec9774043a1e29;p=ceph.git

qa/tasks/ceph: disable osd_debug_deep_scrub_sleep in case it is set

Otherwise the final scrub may take too long.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 3f922e79c3c39710f5fbabc0dacef5f4ab19885b)
---

diff --git a/qa/tasks/ceph.py b/qa/tasks/ceph.py
index 87cbbc1ff561..f61047d98cd4 100644
--- a/qa/tasks/ceph.py
+++ b/qa/tasks/ceph.py
@@ -1059,6 +1059,8 @@ def osd_scrub_pgs(ctx, config):
         # allow this to fail; in certain cases the OSD might not be up
         # at this point.  we will catch all pgs below.
         try:
+            manager.raw_cluster_cmd('tell', 'osd.' + id_, 'config', 'set',
+                                    'osd_debug_deep_scrub_sleep', '0');
             manager.raw_cluster_cmd('osd', 'deep-scrub', id_)
         except run.CommandFailedError:
             pass