From e6918187568dbd01842d8d1d2c808ce16a894239 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 21 Apr 2024 13:54:28 +0200 Subject: Adding upstream version 18.2.2. Signed-off-by: Daniel Baumann --- qa/suites/fs/upgrade/upgraded_client/% | 0 qa/suites/fs/upgrade/upgraded_client/.qa | 1 + .../upgrade/upgraded_client/bluestore-bitmap.yaml | 1 + qa/suites/fs/upgrade/upgraded_client/centos_8.yaml | 1 + qa/suites/fs/upgrade/upgraded_client/clusters/% | 0 qa/suites/fs/upgrade/upgraded_client/clusters/.qa | 1 + .../clusters/1-mds-1-client-micro.yaml | 1 + qa/suites/fs/upgrade/upgraded_client/conf | 1 + qa/suites/fs/upgrade/upgraded_client/overrides/% | 0 qa/suites/fs/upgrade/upgraded_client/overrides/.qa | 1 + .../overrides/ignorelist_health.yaml | 1 + .../overrides/ignorelist_wrongly_marked_down.yaml | 1 + .../upgrade/upgraded_client/overrides/pg-warn.yaml | 5 ++ qa/suites/fs/upgrade/upgraded_client/tasks/% | 0 qa/suites/fs/upgrade/upgraded_client/tasks/.qa | 1 + .../upgraded_client/tasks/0-from/nautilus.yaml | 53 ++++++++++++++++++++++ .../upgraded_client/tasks/0-from/pacific.yaml | 53 ++++++++++++++++++++++ .../fs/upgrade/upgraded_client/tasks/1-mount/.qa | 1 + .../fs/upgrade/upgraded_client/tasks/1-mount/mount | 1 + .../upgrade/upgraded_client/tasks/2-workload/.qa | 1 + .../upgraded_client/tasks/2-workload/new_ops/% | 0 .../2-workload/new_ops/0-clients/fuse-upgrade.yaml | 14 ++++++ .../2-workload/new_ops/0-clients/kclient.yaml | 8 ++++ .../tasks/2-workload/new_ops/1-client-sanity.yaml | 4 ++ .../tasks/2-workload/stress_tests/% | 0 .../tasks/2-workload/stress_tests/.qa | 1 + .../2-workload/stress_tests/0-client-upgrade.yaml | 14 ++++++ .../tasks/2-workload/stress_tests/1-tests/.qa | 1 + .../2-workload/stress_tests/1-tests/blogbench.yaml | 1 + .../2-workload/stress_tests/1-tests/dbench.yaml | 1 + .../2-workload/stress_tests/1-tests/fsstress.yaml | 1 + .../2-workload/stress_tests/1-tests/iozone.yaml | 1 + .../stress_tests/1-tests/kernel_untar_build.yaml | 1 + 33 files changed, 171 insertions(+) create mode 100644 qa/suites/fs/upgrade/upgraded_client/% create mode 120000 qa/suites/fs/upgrade/upgraded_client/.qa create mode 120000 qa/suites/fs/upgrade/upgraded_client/bluestore-bitmap.yaml create mode 120000 qa/suites/fs/upgrade/upgraded_client/centos_8.yaml create mode 100644 qa/suites/fs/upgrade/upgraded_client/clusters/% create mode 120000 qa/suites/fs/upgrade/upgraded_client/clusters/.qa create mode 120000 qa/suites/fs/upgrade/upgraded_client/clusters/1-mds-1-client-micro.yaml create mode 120000 qa/suites/fs/upgrade/upgraded_client/conf create mode 100644 qa/suites/fs/upgrade/upgraded_client/overrides/% create mode 120000 qa/suites/fs/upgrade/upgraded_client/overrides/.qa create mode 120000 qa/suites/fs/upgrade/upgraded_client/overrides/ignorelist_health.yaml create mode 120000 qa/suites/fs/upgrade/upgraded_client/overrides/ignorelist_wrongly_marked_down.yaml create mode 100644 qa/suites/fs/upgrade/upgraded_client/overrides/pg-warn.yaml create mode 100644 qa/suites/fs/upgrade/upgraded_client/tasks/% create mode 120000 qa/suites/fs/upgrade/upgraded_client/tasks/.qa create mode 100644 qa/suites/fs/upgrade/upgraded_client/tasks/0-from/nautilus.yaml create mode 100644 qa/suites/fs/upgrade/upgraded_client/tasks/0-from/pacific.yaml create mode 120000 qa/suites/fs/upgrade/upgraded_client/tasks/1-mount/.qa create mode 120000 qa/suites/fs/upgrade/upgraded_client/tasks/1-mount/mount create mode 120000 qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/.qa create mode 100644 qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/new_ops/% create mode 100644 qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/new_ops/0-clients/fuse-upgrade.yaml create mode 100644 qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/new_ops/0-clients/kclient.yaml create mode 100644 qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/new_ops/1-client-sanity.yaml create mode 100644 qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/% create mode 120000 qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/.qa create mode 100644 qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/0-client-upgrade.yaml create mode 120000 qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/.qa create mode 120000 qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/blogbench.yaml create mode 120000 qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/dbench.yaml create mode 120000 qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/fsstress.yaml create mode 120000 qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/iozone.yaml create mode 120000 qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/kernel_untar_build.yaml (limited to 'qa/suites/fs/upgrade/upgraded_client') diff --git a/qa/suites/fs/upgrade/upgraded_client/% b/qa/suites/fs/upgrade/upgraded_client/% new file mode 100644 index 000000000..e69de29bb diff --git a/qa/suites/fs/upgrade/upgraded_client/.qa b/qa/suites/fs/upgrade/upgraded_client/.qa new file mode 120000 index 000000000..a602a0353 --- /dev/null +++ b/qa/suites/fs/upgrade/upgraded_client/.qa @@ -0,0 +1 @@ +../.qa/ \ No newline at end of file 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 000000000..675dce056 --- /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/centos_8.yaml b/qa/suites/fs/upgrade/upgraded_client/centos_8.yaml new file mode 120000 index 000000000..5dceec7e2 --- /dev/null +++ b/qa/suites/fs/upgrade/upgraded_client/centos_8.yaml @@ -0,0 +1 @@ +.qa/distros/supported/centos_8.stream.yaml \ No newline at end of file diff --git a/qa/suites/fs/upgrade/upgraded_client/clusters/% b/qa/suites/fs/upgrade/upgraded_client/clusters/% new file mode 100644 index 000000000..e69de29bb diff --git a/qa/suites/fs/upgrade/upgraded_client/clusters/.qa b/qa/suites/fs/upgrade/upgraded_client/clusters/.qa new file mode 120000 index 000000000..fea2489fd --- /dev/null +++ b/qa/suites/fs/upgrade/upgraded_client/clusters/.qa @@ -0,0 +1 @@ +../.qa \ No newline at end of file diff --git a/qa/suites/fs/upgrade/upgraded_client/clusters/1-mds-1-client-micro.yaml b/qa/suites/fs/upgrade/upgraded_client/clusters/1-mds-1-client-micro.yaml new file mode 120000 index 000000000..50ffb6d53 --- /dev/null +++ b/qa/suites/fs/upgrade/upgraded_client/clusters/1-mds-1-client-micro.yaml @@ -0,0 +1 @@ +.qa/cephfs/clusters/1-mds-1-client-micro.yaml \ No newline at end of file diff --git a/qa/suites/fs/upgrade/upgraded_client/conf b/qa/suites/fs/upgrade/upgraded_client/conf new file mode 120000 index 000000000..6d4712984 --- /dev/null +++ b/qa/suites/fs/upgrade/upgraded_client/conf @@ -0,0 +1 @@ +.qa/cephfs/conf/ \ No newline at end of file diff --git a/qa/suites/fs/upgrade/upgraded_client/overrides/% b/qa/suites/fs/upgrade/upgraded_client/overrides/% new file mode 100644 index 000000000..e69de29bb diff --git a/qa/suites/fs/upgrade/upgraded_client/overrides/.qa b/qa/suites/fs/upgrade/upgraded_client/overrides/.qa new file mode 120000 index 000000000..a602a0353 --- /dev/null +++ b/qa/suites/fs/upgrade/upgraded_client/overrides/.qa @@ -0,0 +1 @@ +../.qa/ \ No newline at end of file diff --git a/qa/suites/fs/upgrade/upgraded_client/overrides/ignorelist_health.yaml b/qa/suites/fs/upgrade/upgraded_client/overrides/ignorelist_health.yaml new file mode 120000 index 000000000..5cb891a95 --- /dev/null +++ b/qa/suites/fs/upgrade/upgraded_client/overrides/ignorelist_health.yaml @@ -0,0 +1 @@ +.qa/cephfs/overrides/ignorelist_health.yaml \ No newline at end of file diff --git a/qa/suites/fs/upgrade/upgraded_client/overrides/ignorelist_wrongly_marked_down.yaml b/qa/suites/fs/upgrade/upgraded_client/overrides/ignorelist_wrongly_marked_down.yaml new file mode 120000 index 000000000..f317cb714 --- /dev/null +++ b/qa/suites/fs/upgrade/upgraded_client/overrides/ignorelist_wrongly_marked_down.yaml @@ -0,0 +1 @@ +.qa/cephfs/overrides/ignorelist_wrongly_marked_down.yaml \ No newline at end of file diff --git a/qa/suites/fs/upgrade/upgraded_client/overrides/pg-warn.yaml b/qa/suites/fs/upgrade/upgraded_client/overrides/pg-warn.yaml new file mode 100644 index 000000000..4ae54a40d --- /dev/null +++ b/qa/suites/fs/upgrade/upgraded_client/overrides/pg-warn.yaml @@ -0,0 +1,5 @@ +overrides: + ceph: + conf: + global: + mon pg warn min per osd: 0 diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/% b/qa/suites/fs/upgrade/upgraded_client/tasks/% new file mode 100644 index 000000000..e69de29bb diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/.qa b/qa/suites/fs/upgrade/upgraded_client/tasks/.qa new file mode 120000 index 000000000..a602a0353 --- /dev/null +++ b/qa/suites/fs/upgrade/upgraded_client/tasks/.qa @@ -0,0 +1 @@ +../.qa/ \ No newline at end of file diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/0-from/nautilus.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/0-from/nautilus.yaml new file mode 100644 index 000000000..02f541eaf --- /dev/null +++ b/qa/suites/fs/upgrade/upgraded_client/tasks/0-from/nautilus.yaml @@ -0,0 +1,53 @@ +meta: +- desc: | + install ceph/nautilus latest +tasks: +- install: + branch: nautilus + 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 nautilus" +- 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 nautilus +- print: "**** done ceph" diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/0-from/pacific.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/0-from/pacific.yaml new file mode 100644 index 000000000..defb03922 --- /dev/null +++ b/qa/suites/fs/upgrade/upgraded_client/tasks/0-from/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/tasks/1-mount/.qa b/qa/suites/fs/upgrade/upgraded_client/tasks/1-mount/.qa new file mode 120000 index 000000000..a602a0353 --- /dev/null +++ b/qa/suites/fs/upgrade/upgraded_client/tasks/1-mount/.qa @@ -0,0 +1 @@ +../.qa/ \ No newline at end of file diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/1-mount/mount b/qa/suites/fs/upgrade/upgraded_client/tasks/1-mount/mount new file mode 120000 index 000000000..e3600f453 --- /dev/null +++ b/qa/suites/fs/upgrade/upgraded_client/tasks/1-mount/mount @@ -0,0 +1 @@ +.qa/cephfs/mount/ \ No newline at end of file diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/.qa b/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/.qa new file mode 120000 index 000000000..a602a0353 --- /dev/null +++ b/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/.qa @@ -0,0 +1 @@ +../.qa/ \ No newline at end of file diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/new_ops/% b/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/new_ops/% new file mode 100644 index 000000000..e69de29bb diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/new_ops/0-clients/fuse-upgrade.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/new_ops/0-clients/fuse-upgrade.yaml new file mode 100644 index 000000000..34c85a00e --- /dev/null +++ b/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/new_ops/0-clients/fuse-upgrade.yaml @@ -0,0 +1,14 @@ +teuthology: + postmerge: + - if not is_fuse() then reject() end +tasks: +- ceph-fuse: + client.0: + mounted: false +- print: "**** done unmount client.0" +- install.upgrade: + client.0: +- print: "**** done install.upgrade on client.0" +- ceph-fuse: + client.0: +- print: "**** done remount client" diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/new_ops/0-clients/kclient.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/new_ops/0-clients/kclient.yaml new file mode 100644 index 000000000..ecc705600 --- /dev/null +++ b/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/new_ops/0-clients/kclient.yaml @@ -0,0 +1,8 @@ +teuthology: + postmerge: + # Once can we make sure the distro kernels have included the newops fixes + # we can remove the is_kupstream() restriction. While since the Nautilus + # will only support the 'v1' mount syntax, so don't touch the mount syntax + # restriction. + - if not is_kupstream() or syntax_version() == 'v2' then reject() end +tasks: diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/new_ops/1-client-sanity.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/new_ops/1-client-sanity.yaml new file mode 100644 index 000000000..9508cce65 --- /dev/null +++ b/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/new_ops/1-client-sanity.yaml @@ -0,0 +1,4 @@ +tasks: + - cephfs_test_runner: + modules: + - tasks.cephfs.test_newops diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/% b/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/% new file mode 100644 index 000000000..e69de29bb 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 000000000..a602a0353 --- /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/0-client-upgrade.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/0-client-upgrade.yaml new file mode 100644 index 000000000..2d948af19 --- /dev/null +++ b/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/0-client-upgrade.yaml @@ -0,0 +1,14 @@ +teuthology: + postmerge: + - if not is_fuse() then reject() end +tasks: +- ceph-fuse: + client.0: + mounted: false +- print: "**** done unmount client.0" +- install.upgrade: + client.0: +- print: "**** done install.upgrade on client.0" +- ceph-fuse: + client.0: +- print: "**** done remount client.0" diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/.qa b/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/.qa new file mode 120000 index 000000000..a602a0353 --- /dev/null +++ b/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-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/1-tests/blogbench.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/blogbench.yaml new file mode 120000 index 000000000..a2f8b3052 --- /dev/null +++ b/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-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/1-tests/dbench.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/dbench.yaml new file mode 120000 index 000000000..9fb8adcea --- /dev/null +++ b/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-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/1-tests/fsstress.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/fsstress.yaml new file mode 120000 index 000000000..dc777f36d --- /dev/null +++ b/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-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/1-tests/iozone.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/iozone.yaml new file mode 120000 index 000000000..f4d0ead4f --- /dev/null +++ b/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-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/1-tests/kernel_untar_build.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/kernel_untar_build.yaml new file mode 120000 index 000000000..317ebf8c4 --- /dev/null +++ b/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-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 -- cgit v1.2.3