From 898316a72c6fd5729e6b574fade6ba8adc3ca25a Mon Sep 17 00:00:00 2001 From: Xiubo Li Date: Tue, 21 Mar 2023 09:51:49 +0800 Subject: [PATCH] qa: enable kclient test for newop test The kclient have already fix this. This will only enable the upstream kclient with the testing branch, the downstream ones may not include the fixing yet, so skip them for now. The nautilus will only support the syntax v1. And for kclient there is not need to do the upgrade. Fixes: https://tracker.ceph.com/issues/57591 Signed-off-by: Xiubo Li --- .../fs/upgrade/upgraded_client/tasks/1-mount/.qa | 1 + .../fs/upgrade/upgraded_client/tasks/1-mount/mount | 1 + .../upgraded_client/tasks/2-workload/new_ops/% | 0 .../new_ops/0-clients/fuse-upgrade.yaml} | 7 +++++++ .../2-workload/new_ops/0-clients/kclient.yaml | 8 ++++++++ .../{client-sanity.yaml => 1-client-sanity.yaml} | 0 .../tasks/2-workload/stress_tests/% | 0 .../2-workload/stress_tests/0-client-upgrade.yaml | 14 ++++++++++++++ .../tasks/2-workload/stress_tests/1-tests/.qa | 1 + .../stress_tests/{ => 1-tests}/blogbench.yaml | 0 .../stress_tests/{ => 1-tests}/dbench.yaml | 0 .../stress_tests/{ => 1-tests}/fsstress.yaml | 0 .../stress_tests/{ => 1-tests}/iozone.yaml | 0 .../{ => 1-tests}/kernel_untar_build.yaml | 0 14 files changed, 32 insertions(+) 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 100644 qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/new_ops/% rename qa/suites/fs/upgrade/upgraded_client/tasks/{1-client-upgrade.yaml => 2-workload/new_ops/0-clients/fuse-upgrade.yaml} (50%) create mode 100644 qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/new_ops/0-clients/kclient.yaml rename qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/new_ops/{client-sanity.yaml => 1-client-sanity.yaml} (100%) create mode 100644 qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/% 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 rename qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/{ => 1-tests}/blogbench.yaml (100%) rename qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/{ => 1-tests}/dbench.yaml (100%) rename qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/{ => 1-tests}/fsstress.yaml (100%) rename qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/{ => 1-tests}/iozone.yaml (100%) rename qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/{ => 1-tests}/kernel_untar_build.yaml (100%) 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 000000000000..a602a0353e75 --- /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 000000000000..e3600f453f2f --- /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/new_ops/% b/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/new_ops/% new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/1-client-upgrade.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/new_ops/0-clients/fuse-upgrade.yaml similarity index 50% rename from qa/suites/fs/upgrade/upgraded_client/tasks/1-client-upgrade.yaml rename to qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/new_ops/0-clients/fuse-upgrade.yaml index 99b99e642aaa..34c85a00eb5f 100644 --- a/qa/suites/fs/upgrade/upgraded_client/tasks/1-client-upgrade.yaml +++ b/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/new_ops/0-clients/fuse-upgrade.yaml @@ -1,4 +1,11 @@ +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" 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 000000000000..ecc705600ee9 --- /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/client-sanity.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/new_ops/1-client-sanity.yaml similarity index 100% rename from qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/new_ops/client-sanity.yaml rename to qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/new_ops/1-client-sanity.yaml 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 000000000000..e69de29bb2d1 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 000000000000..2d948af19598 --- /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 000000000000..a602a0353e75 --- /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/blogbench.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/blogbench.yaml similarity index 100% rename from qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/blogbench.yaml rename to qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/blogbench.yaml 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/1-tests/dbench.yaml similarity index 100% rename from qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/dbench.yaml rename to qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/dbench.yaml 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/1-tests/fsstress.yaml similarity index 100% rename from qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/fsstress.yaml rename to qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/fsstress.yaml 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/1-tests/iozone.yaml similarity index 100% rename from qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/iozone.yaml rename to qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/iozone.yaml 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/1-tests/kernel_untar_build.yaml similarity index 100% rename from qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/kernel_untar_build.yaml rename to qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/kernel_untar_build.yaml -- 2.47.3