From 59471464235679575533930bae3402af2a12530a Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 29 Jan 2019 17:02:54 -0600 Subject: [PATCH] qa/suites/upgrade/luminous-x/stress-split: mons on separate hosts, enable msgr2 Signed-off-by: Sage Weil --- .../3-thrash/default.yaml | 1 + .../luminous-x/stress-split/0-cluster/start.yaml | 13 +++++++++---- .../stress-split/2-partial-upgrade/firsthalf.yaml | 15 ++++++++------- .../luminous-x/stress-split/3-thrash/default.yaml | 1 + .../luminous-x/stress-split/5-finish-upgrade.yaml | 5 +++-- .../upgrade/luminous-x/stress-split/6-msgr2.yaml | 6 ++++++ .../luminous-x/stress-split/6-nautilus.yaml | 1 + 7 files changed, 29 insertions(+), 13 deletions(-) create mode 100644 qa/suites/upgrade/luminous-x/stress-split/6-msgr2.yaml create mode 120000 qa/suites/upgrade/luminous-x/stress-split/6-nautilus.yaml diff --git a/qa/suites/upgrade/luminous-x/stress-split-erasure-code/3-thrash/default.yaml b/qa/suites/upgrade/luminous-x/stress-split-erasure-code/3-thrash/default.yaml index edae7b3bd68..b12d76e9fe6 100644 --- a/qa/suites/upgrade/luminous-x/stress-split-erasure-code/3-thrash/default.yaml +++ b/qa/suites/upgrade/luminous-x/stress-split-erasure-code/3-thrash/default.yaml @@ -22,4 +22,5 @@ stress-tasks: chance_thrash_pg_upmap: 0 chance_thrash_pg_upmap_items: 0 chance_force_recovery: 0 + aggressive_pg_num_changes: false - print: "**** done thrashosds 3-thrash" diff --git a/qa/suites/upgrade/luminous-x/stress-split/0-cluster/start.yaml b/qa/suites/upgrade/luminous-x/stress-split/0-cluster/start.yaml index 2bc6ca8068f..e2096debfe9 100644 --- a/qa/suites/upgrade/luminous-x/stress-split/0-cluster/start.yaml +++ b/qa/suites/upgrade/luminous-x/stress-split/0-cluster/start.yaml @@ -13,23 +13,28 @@ overrides: - \(MON_DOWN\) - \(MGR_DOWN\) - slow request + - \(MON_MSGR2_NOT_ENABLED\) conf: global: enable experimental unrecoverable data corrupting features: "*" - mon warn on msgr2 not enabled: false + mon warn on msgr2 not enabled: false mon: mon warn on osd down out interval zero: false roles: - - mon.a - - mon.b - - mon.c - mgr.x - osd.0 - osd.1 - osd.2 - osd.3 -- - osd.4 +- - mon.b + - osd.4 - osd.5 - osd.6 - osd.7 +- - mon.c +- - osd.8 + - osd.9 + - osd.10 + - osd.11 - - client.0 diff --git a/qa/suites/upgrade/luminous-x/stress-split/2-partial-upgrade/firsthalf.yaml b/qa/suites/upgrade/luminous-x/stress-split/2-partial-upgrade/firsthalf.yaml index ea3884d9f6d..e084e28daa1 100644 --- a/qa/suites/upgrade/luminous-x/stress-split/2-partial-upgrade/firsthalf.yaml +++ b/qa/suites/upgrade/luminous-x/stress-split/2-partial-upgrade/firsthalf.yaml @@ -1,16 +1,17 @@ meta: - desc: | - install upgrade ceph/-x on one node only - 1st half - restart : osd.0,1,2,3 + install upgrade ceph/-x on 2/3 of cluster + restart : mons, osd.0-7 tasks: - install.upgrade: - osd.0: -- print: "**** done install.upgrade osd.0" + mon.a: + mon.b: + mon.c: +- print: "**** done install.upgrade of first 3 nodes" - ceph.restart: - daemons: [mon.a,mon.b,mon.c,mgr.x,osd.0,osd.1,osd.2,osd.3] + daemons: [mon.a,mon.b,mgr.x,osd.0,osd.1,osd.2,osd.3,osd.4,osd.5,osd.6,osd.7] mon-health-to-clog: false -- print: "**** done ceph.restart 1st half" +- print: "**** done ceph.restart of all mons and 2/3 of osds" - exec: osd.0: - ceph osd set pglog_hardlimit && exit 1 || true diff --git a/qa/suites/upgrade/luminous-x/stress-split/3-thrash/default.yaml b/qa/suites/upgrade/luminous-x/stress-split/3-thrash/default.yaml index b3fddefc7a3..e0f317b0c1a 100644 --- a/qa/suites/upgrade/luminous-x/stress-split/3-thrash/default.yaml +++ b/qa/suites/upgrade/luminous-x/stress-split/3-thrash/default.yaml @@ -22,4 +22,5 @@ stress-tasks: chance_thrash_pg_upmap_items: 0 disable_objectstore_tool_tests: true chance_force_recovery: 0 + aggressive_pg_num_changes: false - print: "**** done thrashosds 3-thrash" diff --git a/qa/suites/upgrade/luminous-x/stress-split/5-finish-upgrade.yaml b/qa/suites/upgrade/luminous-x/stress-split/5-finish-upgrade.yaml index 578d84d3d85..306445c8fbf 100644 --- a/qa/suites/upgrade/luminous-x/stress-split/5-finish-upgrade.yaml +++ b/qa/suites/upgrade/luminous-x/stress-split/5-finish-upgrade.yaml @@ -1,14 +1,15 @@ tasks: - install.upgrade: - osd.4: + osd.8: client.0: - ceph.restart: - daemons: [osd.4, osd.5, osd.6, osd.7] + daemons: [mon.c, osd.8, osd.9, osd.10, osd.11] wait-for-healthy: false wait-for-osds-up: true - exec: osd.0: - ceph osd set pglog_hardlimit - ceph osd dump --format=json-pretty | grep "flags" + - ceph config set global mon_warn_on_msgr2_not_enabled false - print: "**** try to set pglog_hardlimit again, should succeed" diff --git a/qa/suites/upgrade/luminous-x/stress-split/6-msgr2.yaml b/qa/suites/upgrade/luminous-x/stress-split/6-msgr2.yaml new file mode 100644 index 00000000000..f56c8be0894 --- /dev/null +++ b/qa/suites/upgrade/luminous-x/stress-split/6-msgr2.yaml @@ -0,0 +1,6 @@ +tasks: +- exec: + mon.a: + - ceph mon enable-msgr2 + - ceph config rm global mon_warn_on_msgr2_not_enabled +- ceph.healthy: diff --git a/qa/suites/upgrade/luminous-x/stress-split/6-nautilus.yaml b/qa/suites/upgrade/luminous-x/stress-split/6-nautilus.yaml new file mode 120000 index 00000000000..9e99b7d2829 --- /dev/null +++ b/qa/suites/upgrade/luminous-x/stress-split/6-nautilus.yaml @@ -0,0 +1 @@ +.qa/releases/nautilus.yaml \ No newline at end of file -- 2.39.5