From d260ba9f84ed3528a0f25966bce8fc8e35ad1c0f Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 28 Jan 2019 16:54:20 -0600 Subject: [PATCH] qa/suites/upgrade/luminous-x/parallel: mon per host, msgr2 - mon per host - enable msgr2 at the end - include the nautilus.yaml Signed-off-by: Sage Weil --- .../luminous-x/parallel/0-cluster/start.yaml | 13 ++++++++-- .../parallel/1-ceph-install/luminous.yaml | 3 ++- .../3-upgrade-sequence/upgrade-all.yaml | 7 +++++- .../upgrade-mon-osd-mds.yaml | 24 +++++++++++++++---- .../upgrade/luminous-x/parallel/4-msgr2.yaml | 5 ++++ .../luminous-x/parallel/4-nautilus.yaml | 1 + .../{4-final-workload => 5-final-workload}/+ | 0 .../.qa | 0 .../blogbench.yaml | 0 .../rados-snaps-few-objects.yaml | 0 .../rados_loadgenmix.yaml | 0 .../rados_mon_thrash.yaml | 0 .../rbd_cls.yaml | 0 .../rbd_import_export.yaml | 0 .../rgw.yaml | 0 .../rgw_ragweed_check.yaml | 0 .../rgw_swift.yaml | 0 .../stress-split/0-cluster/start.yaml | 1 + 18 files changed, 45 insertions(+), 9 deletions(-) create mode 100644 qa/suites/upgrade/luminous-x/parallel/4-msgr2.yaml create mode 120000 qa/suites/upgrade/luminous-x/parallel/4-nautilus.yaml rename qa/suites/upgrade/luminous-x/parallel/{4-final-workload => 5-final-workload}/+ (100%) rename qa/suites/upgrade/luminous-x/parallel/{4-final-workload => 5-final-workload}/.qa (100%) rename qa/suites/upgrade/luminous-x/parallel/{4-final-workload => 5-final-workload}/blogbench.yaml (100%) rename qa/suites/upgrade/luminous-x/parallel/{4-final-workload => 5-final-workload}/rados-snaps-few-objects.yaml (100%) rename qa/suites/upgrade/luminous-x/parallel/{4-final-workload => 5-final-workload}/rados_loadgenmix.yaml (100%) rename qa/suites/upgrade/luminous-x/parallel/{4-final-workload => 5-final-workload}/rados_mon_thrash.yaml (100%) rename qa/suites/upgrade/luminous-x/parallel/{4-final-workload => 5-final-workload}/rbd_cls.yaml (100%) rename qa/suites/upgrade/luminous-x/parallel/{4-final-workload => 5-final-workload}/rbd_import_export.yaml (100%) rename qa/suites/upgrade/luminous-x/parallel/{4-final-workload => 5-final-workload}/rgw.yaml (100%) rename qa/suites/upgrade/luminous-x/parallel/{4-final-workload => 5-final-workload}/rgw_ragweed_check.yaml (100%) rename qa/suites/upgrade/luminous-x/parallel/{4-final-workload => 5-final-workload}/rgw_swift.yaml (100%) diff --git a/qa/suites/upgrade/luminous-x/parallel/0-cluster/start.yaml b/qa/suites/upgrade/luminous-x/parallel/0-cluster/start.yaml index 6f124d61474..5b20ff55052 100644 --- a/qa/suites/upgrade/luminous-x/parallel/0-cluster/start.yaml +++ b/qa/suites/upgrade/luminous-x/parallel/0-cluster/start.yaml @@ -10,10 +10,18 @@ roles: - mds.a - osd.0 - osd.1 -- - mon.b - - mon.c - osd.2 - osd.3 +- - mon.b + - osd.4 + - osd.5 + - osd.6 + - osd.7 +- - mon.c + - osd.8 + - osd.9 + - osd.10 + - osd.11 - - client.0 - client.1 - client.2 @@ -30,6 +38,7 @@ overrides: - \(SLOW_OPS\) - overall HEALTH_ - slow request + - \(MON_MSGR2_NOT_ENABLED\) conf: global: enable experimental unrecoverable data corrupting features: "*" diff --git a/qa/suites/upgrade/luminous-x/parallel/1-ceph-install/luminous.yaml b/qa/suites/upgrade/luminous-x/parallel/1-ceph-install/luminous.yaml index 3672828b743..865fa517063 100644 --- a/qa/suites/upgrade/luminous-x/parallel/1-ceph-install/luminous.yaml +++ b/qa/suites/upgrade/luminous-x/parallel/1-ceph-install/luminous.yaml @@ -39,7 +39,8 @@ tasks: - install.upgrade: mon.a: mon.b: -- print: "**** done install.upgrade both hosts" + mon.c: +- print: "**** done install.upgrade non-client hosts" - parallel: - workload - upgrade-sequence diff --git a/qa/suites/upgrade/luminous-x/parallel/3-upgrade-sequence/upgrade-all.yaml b/qa/suites/upgrade/luminous-x/parallel/3-upgrade-sequence/upgrade-all.yaml index 5c021bdf130..7fb9829a4a9 100644 --- a/qa/suites/upgrade/luminous-x/parallel/3-upgrade-sequence/upgrade-all.yaml +++ b/qa/suites/upgrade/luminous-x/parallel/3-upgrade-sequence/upgrade-all.yaml @@ -6,8 +6,13 @@ upgrade-sequence: - ceph.restart: daemons: [mon.a, mon.b, mon.c, mgr.x] mon-health-to-clog: false + wait-for-healthy: false + - exec: + mon.a: + - ceph config set global mon_warn_on_msgr2_not_enabled false + - ceph.healthy: - ceph.restart: - daemons: [osd.0, osd.1, osd.2, osd.3] + daemons: [osd.0, osd.1, osd.2, osd.3, osd.4, osd.5, osd.6, osd.7, osd.8, osd.9, osd.10, osd.11] wait-for-healthy: false wait-for-osds-up: true - ceph.restart: diff --git a/qa/suites/upgrade/luminous-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml b/qa/suites/upgrade/luminous-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml index 46a1345fb15..4f9aac75436 100644 --- a/qa/suites/upgrade/luminous-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml +++ b/qa/suites/upgrade/luminous-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml @@ -13,13 +13,23 @@ upgrade-sequence: - sleep: duration: 60 - ceph.restart: - daemons: [mon.b, mon.c, mgr.x] + daemons: [mon.b, mgr.x] wait-for-healthy: true mon-health-to-clog: false - sleep: duration: 60 - ceph.restart: - daemons: [osd.0, osd.1] + daemons: [mon.c] + wait-for-healthy: false + mon-health-to-clog: false + - exec: + mon.a: + - ceph config set global mon_warn_on_msgr2_not_enabled false + - ceph.healthy: + - sleep: + duration: 60 + - ceph.restart: + daemons: [osd.0, osd.1, osd.2, osd.3] wait-for-healthy: true - sleep: duration: 60 @@ -29,8 +39,12 @@ upgrade-sequence: - sleep: duration: 60 - ceph.restart: - daemons: [osd.2, osd.3] - wait-for-healthy: false - wait-for-osds-up: true + daemons: [osd.4, osd.5, osd.6, osd.7] + wait-for-healthy: true + - sleep: + duration: 60 + - ceph.restart: + daemons: [osd.8, osd.9, osd.10, osd.11] + wait-for-healthy: true - sleep: duration: 60 diff --git a/qa/suites/upgrade/luminous-x/parallel/4-msgr2.yaml b/qa/suites/upgrade/luminous-x/parallel/4-msgr2.yaml new file mode 100644 index 00000000000..60e3e200578 --- /dev/null +++ b/qa/suites/upgrade/luminous-x/parallel/4-msgr2.yaml @@ -0,0 +1,5 @@ +tasks: +- exec: + mon.a: + - ceph mon enable-msgr2 + - ceph config rm global mon_warn_on_msgr2_not_enabled diff --git a/qa/suites/upgrade/luminous-x/parallel/4-nautilus.yaml b/qa/suites/upgrade/luminous-x/parallel/4-nautilus.yaml new file mode 120000 index 00000000000..9e99b7d2829 --- /dev/null +++ b/qa/suites/upgrade/luminous-x/parallel/4-nautilus.yaml @@ -0,0 +1 @@ +.qa/releases/nautilus.yaml \ No newline at end of file diff --git a/qa/suites/upgrade/luminous-x/parallel/4-final-workload/+ b/qa/suites/upgrade/luminous-x/parallel/5-final-workload/+ similarity index 100% rename from qa/suites/upgrade/luminous-x/parallel/4-final-workload/+ rename to qa/suites/upgrade/luminous-x/parallel/5-final-workload/+ diff --git a/qa/suites/upgrade/luminous-x/parallel/4-final-workload/.qa b/qa/suites/upgrade/luminous-x/parallel/5-final-workload/.qa similarity index 100% rename from qa/suites/upgrade/luminous-x/parallel/4-final-workload/.qa rename to qa/suites/upgrade/luminous-x/parallel/5-final-workload/.qa diff --git a/qa/suites/upgrade/luminous-x/parallel/4-final-workload/blogbench.yaml b/qa/suites/upgrade/luminous-x/parallel/5-final-workload/blogbench.yaml similarity index 100% rename from qa/suites/upgrade/luminous-x/parallel/4-final-workload/blogbench.yaml rename to qa/suites/upgrade/luminous-x/parallel/5-final-workload/blogbench.yaml diff --git a/qa/suites/upgrade/luminous-x/parallel/4-final-workload/rados-snaps-few-objects.yaml b/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rados-snaps-few-objects.yaml similarity index 100% rename from qa/suites/upgrade/luminous-x/parallel/4-final-workload/rados-snaps-few-objects.yaml rename to qa/suites/upgrade/luminous-x/parallel/5-final-workload/rados-snaps-few-objects.yaml diff --git a/qa/suites/upgrade/luminous-x/parallel/4-final-workload/rados_loadgenmix.yaml b/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rados_loadgenmix.yaml similarity index 100% rename from qa/suites/upgrade/luminous-x/parallel/4-final-workload/rados_loadgenmix.yaml rename to qa/suites/upgrade/luminous-x/parallel/5-final-workload/rados_loadgenmix.yaml diff --git a/qa/suites/upgrade/luminous-x/parallel/4-final-workload/rados_mon_thrash.yaml b/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rados_mon_thrash.yaml similarity index 100% rename from qa/suites/upgrade/luminous-x/parallel/4-final-workload/rados_mon_thrash.yaml rename to qa/suites/upgrade/luminous-x/parallel/5-final-workload/rados_mon_thrash.yaml diff --git a/qa/suites/upgrade/luminous-x/parallel/4-final-workload/rbd_cls.yaml b/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rbd_cls.yaml similarity index 100% rename from qa/suites/upgrade/luminous-x/parallel/4-final-workload/rbd_cls.yaml rename to qa/suites/upgrade/luminous-x/parallel/5-final-workload/rbd_cls.yaml diff --git a/qa/suites/upgrade/luminous-x/parallel/4-final-workload/rbd_import_export.yaml b/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rbd_import_export.yaml similarity index 100% rename from qa/suites/upgrade/luminous-x/parallel/4-final-workload/rbd_import_export.yaml rename to qa/suites/upgrade/luminous-x/parallel/5-final-workload/rbd_import_export.yaml diff --git a/qa/suites/upgrade/luminous-x/parallel/4-final-workload/rgw.yaml b/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rgw.yaml similarity index 100% rename from qa/suites/upgrade/luminous-x/parallel/4-final-workload/rgw.yaml rename to qa/suites/upgrade/luminous-x/parallel/5-final-workload/rgw.yaml diff --git a/qa/suites/upgrade/luminous-x/parallel/4-final-workload/rgw_ragweed_check.yaml b/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rgw_ragweed_check.yaml similarity index 100% rename from qa/suites/upgrade/luminous-x/parallel/4-final-workload/rgw_ragweed_check.yaml rename to qa/suites/upgrade/luminous-x/parallel/5-final-workload/rgw_ragweed_check.yaml diff --git a/qa/suites/upgrade/luminous-x/parallel/4-final-workload/rgw_swift.yaml b/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rgw_swift.yaml similarity index 100% rename from qa/suites/upgrade/luminous-x/parallel/4-final-workload/rgw_swift.yaml rename to qa/suites/upgrade/luminous-x/parallel/5-final-workload/rgw_swift.yaml 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 329fd6ef939..2bc6ca8068f 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 @@ -16,6 +16,7 @@ overrides: conf: global: enable experimental unrecoverable data corrupting features: "*" + mon warn on msgr2 not enabled: false mon: mon warn on osd down out interval zero: false roles: -- 2.39.5