]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
repair_test: Disable scheduled scrubbing to not mess up do_pg_scrub()
authorDavid Zafman <dzafman@redhat.com>
Mon, 2 May 2016 01:11:51 +0000 (18:11 -0700)
committerNathan Cutler <ncutler@suse.com>
Thu, 28 Jul 2016 17:45:29 +0000 (19:45 +0200)
Fixes: http://tracker.ceph.com/issues/15679
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 5c0edbae3eb35654b4efb2e6eb097014953aea12)

tasks/repair_test.py

index 856cd1e992bf3a57334504aa85d57e477e165a58..f71d99e2fb81456e789911bcfd5ee4a46cbfb3c3 100644 (file)
@@ -297,6 +297,9 @@ def task(ctx, config):
 
     ctx.manager.wait_for_all_up()
 
+    ctx.manager.raw_cluster_cmd('osd', 'set', 'noscrub')
+    ctx.manager.raw_cluster_cmd('osd', 'set', 'nodeep-scrub')
+
     repair_test_1(ctx, mdataerr, choose_primary, "scrub")
     repair_test_1(ctx, mdataerr, choose_replica, "scrub")
     repair_test_1(ctx, dataerr, choose_primary, "deep-scrub")