From: John Spray <john.spray@redhat.com>
Date: Thu, 20 Apr 2017 15:35:24 +0000 (+0100)
Subject: qa/suites: disable scrub on shutdown in mgr test
X-Git-Tag: v12.0.3~123^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=017f260c9b43e0726fa01d5575bb5c003bb3cdcd;p=ceph.git

qa/suites: disable scrub on shutdown in mgr test

The tests that exercise mgr failover do not necessarily
leave a happy working mgr daemon in place, and since
pg dump moved into the mgr, that means they should
not try and call "pg dump" to validate PG state on shutdown.

Signed-off-by: John Spray <john.spray@redhat.com>
---

diff --git a/qa/suites/rados/mgr/tasks/failover.yaml b/qa/suites/rados/mgr/tasks/failover.yaml
index b0c7b471ab0c..e02b8bf2cb07 100644
--- a/qa/suites/rados/mgr/tasks/failover.yaml
+++ b/qa/suites/rados/mgr/tasks/failover.yaml
@@ -2,6 +2,9 @@
 tasks:
   - install:
   - ceph:
+      # tests may leave mgrs broken, so don't try and call into them
+      # to invoke e.g. pg dump during teardown.
+      wait-for-scrub: false  
   - cephfs_test_runner:
       modules:
         - tasks.mgr.test_failover