]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
qa/tasks/ceph: disable osd_debug_deep_scrub_sleep in case it is set
authorSage Weil <sage@redhat.com>
Fri, 17 Nov 2017 16:20:40 +0000 (10:20 -0600)
committerDavid Zafman <dzafman@redhat.com>
Fri, 18 May 2018 16:37:56 +0000 (09:37 -0700)
Otherwise the final scrub may take too long.

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

qa/tasks/ceph.py

index 87cbbc1ff561748a842da97ed38814b6b65d0e76..f61047d98cd45ce389dfac11c9f0bcfda6142aa9 100644 (file)
@@ -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