From 179e4bcae9bc7b6b0c049120ed5795c143180e0a Mon Sep 17 00:00:00 2001 From: dparmar18 Date: Wed, 12 Oct 2022 15:57:40 +0530 Subject: [PATCH] qa: test new client with old cluster Fixes: https://tracker.ceph.com/issues/53573 Signed-off-by: Dhairya Parmar --- .../upgraded_client/{from_nautilus => }/% | 0 .../upgraded_client/bluestore-bitmap.yaml | 1 + .../{from_nautilus => }/centos_latest.yaml | 0 .../{from_nautilus => }/clusters/% | 0 .../{from_nautilus => }/clusters/.qa | 0 .../clusters/1-mds-1-client-micro.yaml | 0 .../upgraded_client/{from_nautilus => }/conf | 0 .../from_nautilus/bluestore-bitmap.yaml | 1 - .../{from_nautilus => }/overrides/% | 0 .../{from_nautilus => overrides}/.qa | 0 .../overrides/ignorelist_health.yaml | 0 .../ignorelist_wrongly_marked_down.yaml | 0 .../overrides/pg-warn.yaml | 0 .../{from_nautilus => }/tasks/% | 0 .../{from_nautilus/overrides => tasks}/.qa | 0 .../tasks => tasks/0-from}/0-nautilus.yaml | 9 ++++ .../tasks/0-from/0-pacific.yaml | 53 +++++++++++++++++++ .../tasks/1-client-upgrade.yaml | 0 .../tasks => tasks/2-workload}/.qa | 0 .../2-workload/new_ops/client-sanity.yaml} | 0 .../tasks/2-workload/stress_tests/.qa | 1 + .../2-workload/stress_tests/blogbench.yaml | 1 + .../tasks/2-workload/stress_tests/dbench.yaml | 1 + .../2-workload/stress_tests/fsstress.yaml | 1 + .../tasks/2-workload/stress_tests/iozone.yaml | 1 + .../stress_tests/kernel_untar_build.yaml | 1 + 26 files changed, 69 insertions(+), 1 deletion(-) rename qa/suites/fs/upgrade/upgraded_client/{from_nautilus => }/% (100%) create mode 120000 qa/suites/fs/upgrade/upgraded_client/bluestore-bitmap.yaml rename qa/suites/fs/upgrade/upgraded_client/{from_nautilus => }/centos_latest.yaml (100%) rename qa/suites/fs/upgrade/upgraded_client/{from_nautilus => }/clusters/% (100%) rename qa/suites/fs/upgrade/upgraded_client/{from_nautilus => }/clusters/.qa (100%) rename qa/suites/fs/upgrade/upgraded_client/{from_nautilus => }/clusters/1-mds-1-client-micro.yaml (100%) rename qa/suites/fs/upgrade/upgraded_client/{from_nautilus => }/conf (100%) delete mode 120000 qa/suites/fs/upgrade/upgraded_client/from_nautilus/bluestore-bitmap.yaml rename qa/suites/fs/upgrade/upgraded_client/{from_nautilus => }/overrides/% (100%) rename qa/suites/fs/upgrade/upgraded_client/{from_nautilus => overrides}/.qa (100%) rename qa/suites/fs/upgrade/upgraded_client/{from_nautilus => }/overrides/ignorelist_health.yaml (100%) rename qa/suites/fs/upgrade/upgraded_client/{from_nautilus => }/overrides/ignorelist_wrongly_marked_down.yaml (100%) rename qa/suites/fs/upgrade/upgraded_client/{from_nautilus => }/overrides/pg-warn.yaml (100%) rename qa/suites/fs/upgrade/upgraded_client/{from_nautilus => }/tasks/% (100%) rename qa/suites/fs/upgrade/upgraded_client/{from_nautilus/overrides => tasks}/.qa (100%) rename qa/suites/fs/upgrade/upgraded_client/{from_nautilus/tasks => tasks/0-from}/0-nautilus.yaml (82%) create mode 100644 qa/suites/fs/upgrade/upgraded_client/tasks/0-from/0-pacific.yaml rename qa/suites/fs/upgrade/upgraded_client/{from_nautilus => }/tasks/1-client-upgrade.yaml (100%) rename qa/suites/fs/upgrade/upgraded_client/{from_nautilus/tasks => tasks/2-workload}/.qa (100%) rename qa/suites/fs/upgrade/upgraded_client/{from_nautilus/tasks/2-client-sanity.yaml => tasks/2-workload/new_ops/client-sanity.yaml} (100%) create mode 120000 qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/.qa create mode 120000 qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/blogbench.yaml create mode 120000 qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/dbench.yaml create mode 120000 qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/fsstress.yaml create mode 120000 qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/iozone.yaml create mode 120000 qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/kernel_untar_build.yaml diff --git a/qa/suites/fs/upgrade/upgraded_client/from_nautilus/% b/qa/suites/fs/upgrade/upgraded_client/% similarity index 100% rename from qa/suites/fs/upgrade/upgraded_client/from_nautilus/% rename to qa/suites/fs/upgrade/upgraded_client/% diff --git a/qa/suites/fs/upgrade/upgraded_client/bluestore-bitmap.yaml b/qa/suites/fs/upgrade/upgraded_client/bluestore-bitmap.yaml new file mode 120000 index 00000000000..675dce0566b --- /dev/null +++ b/qa/suites/fs/upgrade/upgraded_client/bluestore-bitmap.yaml @@ -0,0 +1 @@ +../../../../cephfs/objectstore-ec/bluestore-bitmap.yaml \ No newline at end of file diff --git a/qa/suites/fs/upgrade/upgraded_client/from_nautilus/centos_latest.yaml b/qa/suites/fs/upgrade/upgraded_client/centos_latest.yaml similarity index 100% rename from qa/suites/fs/upgrade/upgraded_client/from_nautilus/centos_latest.yaml rename to qa/suites/fs/upgrade/upgraded_client/centos_latest.yaml diff --git a/qa/suites/fs/upgrade/upgraded_client/from_nautilus/clusters/% b/qa/suites/fs/upgrade/upgraded_client/clusters/% similarity index 100% rename from qa/suites/fs/upgrade/upgraded_client/from_nautilus/clusters/% rename to qa/suites/fs/upgrade/upgraded_client/clusters/% diff --git a/qa/suites/fs/upgrade/upgraded_client/from_nautilus/clusters/.qa b/qa/suites/fs/upgrade/upgraded_client/clusters/.qa similarity index 100% rename from qa/suites/fs/upgrade/upgraded_client/from_nautilus/clusters/.qa rename to qa/suites/fs/upgrade/upgraded_client/clusters/.qa diff --git a/qa/suites/fs/upgrade/upgraded_client/from_nautilus/clusters/1-mds-1-client-micro.yaml b/qa/suites/fs/upgrade/upgraded_client/clusters/1-mds-1-client-micro.yaml similarity index 100% rename from qa/suites/fs/upgrade/upgraded_client/from_nautilus/clusters/1-mds-1-client-micro.yaml rename to qa/suites/fs/upgrade/upgraded_client/clusters/1-mds-1-client-micro.yaml diff --git a/qa/suites/fs/upgrade/upgraded_client/from_nautilus/conf b/qa/suites/fs/upgrade/upgraded_client/conf similarity index 100% rename from qa/suites/fs/upgrade/upgraded_client/from_nautilus/conf rename to qa/suites/fs/upgrade/upgraded_client/conf diff --git a/qa/suites/fs/upgrade/upgraded_client/from_nautilus/bluestore-bitmap.yaml b/qa/suites/fs/upgrade/upgraded_client/from_nautilus/bluestore-bitmap.yaml deleted file mode 120000 index 17ad98e799e..00000000000 --- a/qa/suites/fs/upgrade/upgraded_client/from_nautilus/bluestore-bitmap.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../../cephfs/objectstore-ec/bluestore-bitmap.yaml \ No newline at end of file diff --git a/qa/suites/fs/upgrade/upgraded_client/from_nautilus/overrides/% b/qa/suites/fs/upgrade/upgraded_client/overrides/% similarity index 100% rename from qa/suites/fs/upgrade/upgraded_client/from_nautilus/overrides/% rename to qa/suites/fs/upgrade/upgraded_client/overrides/% diff --git a/qa/suites/fs/upgrade/upgraded_client/from_nautilus/.qa b/qa/suites/fs/upgrade/upgraded_client/overrides/.qa similarity index 100% rename from qa/suites/fs/upgrade/upgraded_client/from_nautilus/.qa rename to qa/suites/fs/upgrade/upgraded_client/overrides/.qa diff --git a/qa/suites/fs/upgrade/upgraded_client/from_nautilus/overrides/ignorelist_health.yaml b/qa/suites/fs/upgrade/upgraded_client/overrides/ignorelist_health.yaml similarity index 100% rename from qa/suites/fs/upgrade/upgraded_client/from_nautilus/overrides/ignorelist_health.yaml rename to qa/suites/fs/upgrade/upgraded_client/overrides/ignorelist_health.yaml diff --git a/qa/suites/fs/upgrade/upgraded_client/from_nautilus/overrides/ignorelist_wrongly_marked_down.yaml b/qa/suites/fs/upgrade/upgraded_client/overrides/ignorelist_wrongly_marked_down.yaml similarity index 100% rename from qa/suites/fs/upgrade/upgraded_client/from_nautilus/overrides/ignorelist_wrongly_marked_down.yaml rename to qa/suites/fs/upgrade/upgraded_client/overrides/ignorelist_wrongly_marked_down.yaml diff --git a/qa/suites/fs/upgrade/upgraded_client/from_nautilus/overrides/pg-warn.yaml b/qa/suites/fs/upgrade/upgraded_client/overrides/pg-warn.yaml similarity index 100% rename from qa/suites/fs/upgrade/upgraded_client/from_nautilus/overrides/pg-warn.yaml rename to qa/suites/fs/upgrade/upgraded_client/overrides/pg-warn.yaml diff --git a/qa/suites/fs/upgrade/upgraded_client/from_nautilus/tasks/% b/qa/suites/fs/upgrade/upgraded_client/tasks/% similarity index 100% rename from qa/suites/fs/upgrade/upgraded_client/from_nautilus/tasks/% rename to qa/suites/fs/upgrade/upgraded_client/tasks/% diff --git a/qa/suites/fs/upgrade/upgraded_client/from_nautilus/overrides/.qa b/qa/suites/fs/upgrade/upgraded_client/tasks/.qa similarity index 100% rename from qa/suites/fs/upgrade/upgraded_client/from_nautilus/overrides/.qa rename to qa/suites/fs/upgrade/upgraded_client/tasks/.qa diff --git a/qa/suites/fs/upgrade/upgraded_client/from_nautilus/tasks/0-nautilus.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/0-from/0-nautilus.yaml similarity index 82% rename from qa/suites/fs/upgrade/upgraded_client/from_nautilus/tasks/0-nautilus.yaml rename to qa/suites/fs/upgrade/upgraded_client/tasks/0-from/0-nautilus.yaml index 2b6d3753e52..02f541eaf30 100644 --- a/qa/suites/fs/upgrade/upgraded_client/from_nautilus/tasks/0-nautilus.yaml +++ b/qa/suites/fs/upgrade/upgraded_client/tasks/0-from/0-nautilus.yaml @@ -18,6 +18,15 @@ tasks: - python-rgw - python-rbd - python-cephfs + # For kernel_untar_build workunit + extra_system_packages: + - bison + - flex + - elfutils-libelf-devel + - openssl-devel + - NetworkManager + - iproute + - util-linux - print: "**** done installing nautilus" - ceph: log-ignorelist: diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/0-from/0-pacific.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/0-from/0-pacific.yaml new file mode 100644 index 00000000000..defb0392259 --- /dev/null +++ b/qa/suites/fs/upgrade/upgraded_client/tasks/0-from/0-pacific.yaml @@ -0,0 +1,53 @@ +meta: +- desc: | + install ceph/pacific latest +tasks: +- install: + branch: pacific + exclude_packages: + - cephadm + - ceph-mgr-cephadm + - ceph-immutable-object-cache + - python3-rados + - python3-rgw + - python3-rbd + - python3-cephfs + - ceph-volume + extra_packages: + - python-rados + - python-rgw + - python-rbd + - python-cephfs + # For kernel_untar_build workunit + extra_system_packages: + - bison + - flex + - elfutils-libelf-devel + - openssl-devel + - NetworkManager + - iproute + - util-linux +- print: "**** done installing pacific" +- ceph: + log-ignorelist: + - overall HEALTH_ + - \(FS_ + - \(MDS_ + - \(OSD_ + - \(MON_DOWN\) + - \(CACHE_POOL_ + - \(POOL_ + - \(MGR_DOWN\) + - \(PG_ + - \(SMALLER_PGP_NUM\) + - Monitor daemon marked osd + - Behind on trimming + - Manager daemon + conf: + global: + mon warn on pool no app: false + ms bind msgr2: false +- exec: + osd.0: + - ceph osd set-require-min-compat-client pacific +- print: "**** done ceph" diff --git a/qa/suites/fs/upgrade/upgraded_client/from_nautilus/tasks/1-client-upgrade.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/1-client-upgrade.yaml similarity index 100% rename from qa/suites/fs/upgrade/upgraded_client/from_nautilus/tasks/1-client-upgrade.yaml rename to qa/suites/fs/upgrade/upgraded_client/tasks/1-client-upgrade.yaml diff --git a/qa/suites/fs/upgrade/upgraded_client/from_nautilus/tasks/.qa b/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/.qa similarity index 100% rename from qa/suites/fs/upgrade/upgraded_client/from_nautilus/tasks/.qa rename to qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/.qa diff --git a/qa/suites/fs/upgrade/upgraded_client/from_nautilus/tasks/2-client-sanity.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/new_ops/client-sanity.yaml similarity index 100% rename from qa/suites/fs/upgrade/upgraded_client/from_nautilus/tasks/2-client-sanity.yaml rename to qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/new_ops/client-sanity.yaml diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/.qa b/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/.qa new file mode 120000 index 00000000000..a602a0353e7 --- /dev/null +++ b/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/.qa @@ -0,0 +1 @@ +../.qa/ \ No newline at end of file diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/blogbench.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/blogbench.yaml new file mode 120000 index 00000000000..a2f8b3052a9 --- /dev/null +++ b/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/blogbench.yaml @@ -0,0 +1 @@ +.qa/suites/fs/workload/tasks/5-workunit/suites/blogbench.yaml \ No newline at end of file diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/dbench.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/dbench.yaml new file mode 120000 index 00000000000..9fb8adcea03 --- /dev/null +++ b/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/dbench.yaml @@ -0,0 +1 @@ +.qa/suites/fs/workload/tasks/5-workunit/suites/dbench.yaml \ No newline at end of file diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/fsstress.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/fsstress.yaml new file mode 120000 index 00000000000..dc777f36d33 --- /dev/null +++ b/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/fsstress.yaml @@ -0,0 +1 @@ +.qa/suites/fs/workload/tasks/5-workunit/suites/fsstress.yaml \ No newline at end of file diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/iozone.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/iozone.yaml new file mode 120000 index 00000000000..f4d0ead4f00 --- /dev/null +++ b/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/iozone.yaml @@ -0,0 +1 @@ +.qa/suites/fs/workload/tasks/5-workunit/suites/iozone.yaml \ No newline at end of file diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/kernel_untar_build.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/kernel_untar_build.yaml new file mode 120000 index 00000000000..317ebf8c42c --- /dev/null +++ b/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/kernel_untar_build.yaml @@ -0,0 +1 @@ +.qa/suites/fs/workload/tasks/5-workunit/kernel_untar_build.yaml \ No newline at end of file -- 2.39.5