From: Sage Weil Date: Thu, 13 Dec 2018 22:04:19 +0000 (-0600) Subject: qa/suites/rados/upgrade: no aggressive pg num changes X-Git-Tag: v14.1.0~484^2~53 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=68913080b5db13087dd0b1677a0ca9051d41a422;p=ceph.git 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 --- 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 d9b736721af..e36882da43f 100644 --- 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 a03c8d8149c..bd917f24f90 100644 --- 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: