qa/suites/rados/upgrade: no aggressive pg num changes

We now run with mixed mons and old mgrs, so this won't work.

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

diff --git a/qa/suites/rados/upgrade/luminous-x-singleton/3-thrash/default.yaml b/qa/suites/rados/upgrade/luminous-x-singleton/3-thrash/default.yaml
index d9b736721af7c3b44c1fab58c8cb8e4077558497..e36882da43fad2542ed0e88314c53486d6cefad9 100644 (file)
--- a/qa/suites/rados/upgrade/luminous-x-singleton/3-thrash/default.yaml
+++ b/qa/suites/rados/upgrade/luminous-x-singleton/3-thrash/default.yaml
@@ -18,4 +18,5 @@ split_tasks:
         timeout: 1200
         chance_pgnum_grow: 1
         chance_pgpnum_fix: 1
+        aggressive_pg_num_changes: false
     - print: "**** done thrashosds 3-thrash"

diff --git a/qa/suites/rados/upgrade/luminous-x-singleton/6-finish-upgrade.yaml b/qa/suites/rados/upgrade/luminous-x-singleton/6-finish-upgrade.yaml
index a03c8d8149cbf530b2d55b9c7a524207a7dcfd71..bd917f24f90396db871c99f9c8d9d881491297a8 100644 (file)
--- a/qa/suites/rados/upgrade/luminous-x-singleton/6-finish-upgrade.yaml
+++ b/qa/suites/rados/upgrade/luminous-x-singleton/6-finish-upgrade.yaml
@@ -12,7 +12,7 @@ tasks:
 - install.upgrade:
     osd.3:
 - ceph.restart:
-    daemons: [mon.b]
+    daemons: [mon.b, mgr.x, mgr.y]
     wait-for-up: true
     wait-for-healthy: false
 - ceph.restart: