From 5235ffedf456bd2b83f628cb69631b3f309171ea Mon Sep 17 00:00:00 2001 From: Leonid Usov Date: Sat, 23 Mar 2024 08:29:28 -0700 Subject: [PATCH] squid: qa/suites/fs: add quiescer to the fs suite Signed-off-by: Leonid Usov (cherry picked from commit d6f8d65423ff2d8167836152dddadce1a94134be) Fixes: https://tracker.ceph.com/issues/66103 --- qa/suites/fs/cephadm/multivolume/2-workload/dbench.yaml | 2 +- qa/suites/fs/thrash/workloads/tasks/1-thrash/with-quiesce.yaml | 2 ++ .../tasks/3-workload/stress_tests/blogbench.yaml | 2 +- .../upgraded_client/tasks/3-workload/stress_tests/dbench.yaml | 2 +- .../upgraded_client/tasks/3-workload/stress_tests/fsstress.yaml | 2 +- .../upgraded_client/tasks/3-workload/stress_tests/iozone.yaml | 2 +- .../tasks/3-workload/stress_tests/kernel_untar_build.yaml | 2 +- qa/suites/fs/workload/tasks/{5-workunit => 5-quiesce}/.qa | 0 qa/suites/fs/workload/tasks/5-quiesce/no.yaml | 0 qa/suites/fs/workload/tasks/5-quiesce/with-quiesce.yaml | 2 ++ qa/suites/fs/workload/tasks/{5-workunit/fs => 6-workunit}/.qa | 0 .../fs/workload/tasks/{5-workunit => 6-workunit}/direct_io.yaml | 0 .../fs/workload/tasks/{5-workunit/suites => 6-workunit/fs}/.qa | 0 .../fs/workload/tasks/{5-workunit => 6-workunit}/fs/misc.yaml | 0 .../workload/tasks/{5-workunit => 6-workunit}/fs/norstats.yaml | 0 .../tasks/{5-workunit => 6-workunit}/fs/test_o_trunc.yaml | 0 .../tasks/{5-workunit => 6-workunit}/kernel_untar_build.yaml | 0 .../fs/workload/tasks/{5-workunit => 6-workunit}/postgres.yaml | 0 qa/suites/fs/workload/tasks/6-workunit/suites/.qa | 1 + .../tasks/{5-workunit => 6-workunit}/suites/blogbench.yaml | 0 .../tasks/{5-workunit => 6-workunit}/suites/dbench.yaml | 0 .../workload/tasks/{5-workunit => 6-workunit}/suites/ffsb.yaml | 0 .../tasks/{5-workunit => 6-workunit}/suites/fsstress.yaml | 0 .../workload/tasks/{5-workunit => 6-workunit}/suites/fsx.yaml | 0 .../tasks/{5-workunit => 6-workunit}/suites/fsync-tester.yaml | 0 .../workload/tasks/{5-workunit => 6-workunit}/suites/iogen.yaml | 0 .../tasks/{5-workunit => 6-workunit}/suites/iozone.yaml | 0 .../workload/tasks/{5-workunit => 6-workunit}/suites/pjd.yaml | 0 28 files changed, 11 insertions(+), 6 deletions(-) create mode 100644 qa/suites/fs/thrash/workloads/tasks/1-thrash/with-quiesce.yaml rename qa/suites/fs/workload/tasks/{5-workunit => 5-quiesce}/.qa (100%) create mode 100644 qa/suites/fs/workload/tasks/5-quiesce/no.yaml create mode 100644 qa/suites/fs/workload/tasks/5-quiesce/with-quiesce.yaml rename qa/suites/fs/workload/tasks/{5-workunit/fs => 6-workunit}/.qa (100%) rename qa/suites/fs/workload/tasks/{5-workunit => 6-workunit}/direct_io.yaml (100%) rename qa/suites/fs/workload/tasks/{5-workunit/suites => 6-workunit/fs}/.qa (100%) rename qa/suites/fs/workload/tasks/{5-workunit => 6-workunit}/fs/misc.yaml (100%) rename qa/suites/fs/workload/tasks/{5-workunit => 6-workunit}/fs/norstats.yaml (100%) rename qa/suites/fs/workload/tasks/{5-workunit => 6-workunit}/fs/test_o_trunc.yaml (100%) rename qa/suites/fs/workload/tasks/{5-workunit => 6-workunit}/kernel_untar_build.yaml (100%) rename qa/suites/fs/workload/tasks/{5-workunit => 6-workunit}/postgres.yaml (100%) create mode 120000 qa/suites/fs/workload/tasks/6-workunit/suites/.qa rename qa/suites/fs/workload/tasks/{5-workunit => 6-workunit}/suites/blogbench.yaml (100%) rename qa/suites/fs/workload/tasks/{5-workunit => 6-workunit}/suites/dbench.yaml (100%) rename qa/suites/fs/workload/tasks/{5-workunit => 6-workunit}/suites/ffsb.yaml (100%) rename qa/suites/fs/workload/tasks/{5-workunit => 6-workunit}/suites/fsstress.yaml (100%) rename qa/suites/fs/workload/tasks/{5-workunit => 6-workunit}/suites/fsx.yaml (100%) rename qa/suites/fs/workload/tasks/{5-workunit => 6-workunit}/suites/fsync-tester.yaml (100%) rename qa/suites/fs/workload/tasks/{5-workunit => 6-workunit}/suites/iogen.yaml (100%) rename qa/suites/fs/workload/tasks/{5-workunit => 6-workunit}/suites/iozone.yaml (100%) rename qa/suites/fs/workload/tasks/{5-workunit => 6-workunit}/suites/pjd.yaml (100%) diff --git a/qa/suites/fs/cephadm/multivolume/2-workload/dbench.yaml b/qa/suites/fs/cephadm/multivolume/2-workload/dbench.yaml index 9fb8adcea03ec..a89c9b9cd40fb 120000 --- a/qa/suites/fs/cephadm/multivolume/2-workload/dbench.yaml +++ b/qa/suites/fs/cephadm/multivolume/2-workload/dbench.yaml @@ -1 +1 @@ -.qa/suites/fs/workload/tasks/5-workunit/suites/dbench.yaml \ No newline at end of file +.qa/suites/fs/workload/tasks/6-workunit/suites/dbench.yaml \ No newline at end of file diff --git a/qa/suites/fs/thrash/workloads/tasks/1-thrash/with-quiesce.yaml b/qa/suites/fs/thrash/workloads/tasks/1-thrash/with-quiesce.yaml new file mode 100644 index 0000000000000..9fc7bb3a12556 --- /dev/null +++ b/qa/suites/fs/thrash/workloads/tasks/1-thrash/with-quiesce.yaml @@ -0,0 +1,2 @@ +tasks: +- quiescer: diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/blogbench.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/blogbench.yaml index a2f8b3052a923..8e15ba14d5758 120000 --- a/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/blogbench.yaml +++ b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/blogbench.yaml @@ -1 +1 @@ -.qa/suites/fs/workload/tasks/5-workunit/suites/blogbench.yaml \ No newline at end of file +.qa/suites/fs/workload/tasks/6-workunit/suites/blogbench.yaml \ No newline at end of file diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/dbench.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/dbench.yaml index 9fb8adcea03ec..a89c9b9cd40fb 120000 --- a/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/dbench.yaml +++ b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/dbench.yaml @@ -1 +1 @@ -.qa/suites/fs/workload/tasks/5-workunit/suites/dbench.yaml \ No newline at end of file +.qa/suites/fs/workload/tasks/6-workunit/suites/dbench.yaml \ No newline at end of file diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/fsstress.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/fsstress.yaml index dc777f36d33cd..8cfdc771da8ba 120000 --- a/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/fsstress.yaml +++ b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/fsstress.yaml @@ -1 +1 @@ -.qa/suites/fs/workload/tasks/5-workunit/suites/fsstress.yaml \ No newline at end of file +.qa/suites/fs/workload/tasks/6-workunit/suites/fsstress.yaml \ No newline at end of file diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/iozone.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/iozone.yaml index f4d0ead4f00a7..1aed8d429c9bf 120000 --- a/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/iozone.yaml +++ b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/iozone.yaml @@ -1 +1 @@ -.qa/suites/fs/workload/tasks/5-workunit/suites/iozone.yaml \ No newline at end of file +.qa/suites/fs/workload/tasks/6-workunit/suites/iozone.yaml \ No newline at end of file diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/kernel_untar_build.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/kernel_untar_build.yaml index 317ebf8c42c57..8d174275a41ff 120000 --- a/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/kernel_untar_build.yaml +++ b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/kernel_untar_build.yaml @@ -1 +1 @@ -.qa/suites/fs/workload/tasks/5-workunit/kernel_untar_build.yaml \ No newline at end of file +.qa/suites/fs/workload/tasks/6-workunit/kernel_untar_build.yaml \ No newline at end of file diff --git a/qa/suites/fs/workload/tasks/5-workunit/.qa b/qa/suites/fs/workload/tasks/5-quiesce/.qa similarity index 100% rename from qa/suites/fs/workload/tasks/5-workunit/.qa rename to qa/suites/fs/workload/tasks/5-quiesce/.qa diff --git a/qa/suites/fs/workload/tasks/5-quiesce/no.yaml b/qa/suites/fs/workload/tasks/5-quiesce/no.yaml new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/qa/suites/fs/workload/tasks/5-quiesce/with-quiesce.yaml b/qa/suites/fs/workload/tasks/5-quiesce/with-quiesce.yaml new file mode 100644 index 0000000000000..9fc7bb3a12556 --- /dev/null +++ b/qa/suites/fs/workload/tasks/5-quiesce/with-quiesce.yaml @@ -0,0 +1,2 @@ +tasks: +- quiescer: diff --git a/qa/suites/fs/workload/tasks/5-workunit/fs/.qa b/qa/suites/fs/workload/tasks/6-workunit/.qa similarity index 100% rename from qa/suites/fs/workload/tasks/5-workunit/fs/.qa rename to qa/suites/fs/workload/tasks/6-workunit/.qa diff --git a/qa/suites/fs/workload/tasks/5-workunit/direct_io.yaml b/qa/suites/fs/workload/tasks/6-workunit/direct_io.yaml similarity index 100% rename from qa/suites/fs/workload/tasks/5-workunit/direct_io.yaml rename to qa/suites/fs/workload/tasks/6-workunit/direct_io.yaml diff --git a/qa/suites/fs/workload/tasks/5-workunit/suites/.qa b/qa/suites/fs/workload/tasks/6-workunit/fs/.qa similarity index 100% rename from qa/suites/fs/workload/tasks/5-workunit/suites/.qa rename to qa/suites/fs/workload/tasks/6-workunit/fs/.qa diff --git a/qa/suites/fs/workload/tasks/5-workunit/fs/misc.yaml b/qa/suites/fs/workload/tasks/6-workunit/fs/misc.yaml similarity index 100% rename from qa/suites/fs/workload/tasks/5-workunit/fs/misc.yaml rename to qa/suites/fs/workload/tasks/6-workunit/fs/misc.yaml diff --git a/qa/suites/fs/workload/tasks/5-workunit/fs/norstats.yaml b/qa/suites/fs/workload/tasks/6-workunit/fs/norstats.yaml similarity index 100% rename from qa/suites/fs/workload/tasks/5-workunit/fs/norstats.yaml rename to qa/suites/fs/workload/tasks/6-workunit/fs/norstats.yaml diff --git a/qa/suites/fs/workload/tasks/5-workunit/fs/test_o_trunc.yaml b/qa/suites/fs/workload/tasks/6-workunit/fs/test_o_trunc.yaml similarity index 100% rename from qa/suites/fs/workload/tasks/5-workunit/fs/test_o_trunc.yaml rename to qa/suites/fs/workload/tasks/6-workunit/fs/test_o_trunc.yaml diff --git a/qa/suites/fs/workload/tasks/5-workunit/kernel_untar_build.yaml b/qa/suites/fs/workload/tasks/6-workunit/kernel_untar_build.yaml similarity index 100% rename from qa/suites/fs/workload/tasks/5-workunit/kernel_untar_build.yaml rename to qa/suites/fs/workload/tasks/6-workunit/kernel_untar_build.yaml diff --git a/qa/suites/fs/workload/tasks/5-workunit/postgres.yaml b/qa/suites/fs/workload/tasks/6-workunit/postgres.yaml similarity index 100% rename from qa/suites/fs/workload/tasks/5-workunit/postgres.yaml rename to qa/suites/fs/workload/tasks/6-workunit/postgres.yaml diff --git a/qa/suites/fs/workload/tasks/6-workunit/suites/.qa b/qa/suites/fs/workload/tasks/6-workunit/suites/.qa new file mode 120000 index 0000000000000..a602a0353e751 --- /dev/null +++ b/qa/suites/fs/workload/tasks/6-workunit/suites/.qa @@ -0,0 +1 @@ +../.qa/ \ No newline at end of file diff --git a/qa/suites/fs/workload/tasks/5-workunit/suites/blogbench.yaml b/qa/suites/fs/workload/tasks/6-workunit/suites/blogbench.yaml similarity index 100% rename from qa/suites/fs/workload/tasks/5-workunit/suites/blogbench.yaml rename to qa/suites/fs/workload/tasks/6-workunit/suites/blogbench.yaml diff --git a/qa/suites/fs/workload/tasks/5-workunit/suites/dbench.yaml b/qa/suites/fs/workload/tasks/6-workunit/suites/dbench.yaml similarity index 100% rename from qa/suites/fs/workload/tasks/5-workunit/suites/dbench.yaml rename to qa/suites/fs/workload/tasks/6-workunit/suites/dbench.yaml diff --git a/qa/suites/fs/workload/tasks/5-workunit/suites/ffsb.yaml b/qa/suites/fs/workload/tasks/6-workunit/suites/ffsb.yaml similarity index 100% rename from qa/suites/fs/workload/tasks/5-workunit/suites/ffsb.yaml rename to qa/suites/fs/workload/tasks/6-workunit/suites/ffsb.yaml diff --git a/qa/suites/fs/workload/tasks/5-workunit/suites/fsstress.yaml b/qa/suites/fs/workload/tasks/6-workunit/suites/fsstress.yaml similarity index 100% rename from qa/suites/fs/workload/tasks/5-workunit/suites/fsstress.yaml rename to qa/suites/fs/workload/tasks/6-workunit/suites/fsstress.yaml diff --git a/qa/suites/fs/workload/tasks/5-workunit/suites/fsx.yaml b/qa/suites/fs/workload/tasks/6-workunit/suites/fsx.yaml similarity index 100% rename from qa/suites/fs/workload/tasks/5-workunit/suites/fsx.yaml rename to qa/suites/fs/workload/tasks/6-workunit/suites/fsx.yaml diff --git a/qa/suites/fs/workload/tasks/5-workunit/suites/fsync-tester.yaml b/qa/suites/fs/workload/tasks/6-workunit/suites/fsync-tester.yaml similarity index 100% rename from qa/suites/fs/workload/tasks/5-workunit/suites/fsync-tester.yaml rename to qa/suites/fs/workload/tasks/6-workunit/suites/fsync-tester.yaml diff --git a/qa/suites/fs/workload/tasks/5-workunit/suites/iogen.yaml b/qa/suites/fs/workload/tasks/6-workunit/suites/iogen.yaml similarity index 100% rename from qa/suites/fs/workload/tasks/5-workunit/suites/iogen.yaml rename to qa/suites/fs/workload/tasks/6-workunit/suites/iogen.yaml diff --git a/qa/suites/fs/workload/tasks/5-workunit/suites/iozone.yaml b/qa/suites/fs/workload/tasks/6-workunit/suites/iozone.yaml similarity index 100% rename from qa/suites/fs/workload/tasks/5-workunit/suites/iozone.yaml rename to qa/suites/fs/workload/tasks/6-workunit/suites/iozone.yaml diff --git a/qa/suites/fs/workload/tasks/5-workunit/suites/pjd.yaml b/qa/suites/fs/workload/tasks/6-workunit/suites/pjd.yaml similarity index 100% rename from qa/suites/fs/workload/tasks/5-workunit/suites/pjd.yaml rename to qa/suites/fs/workload/tasks/6-workunit/suites/pjd.yaml -- 2.39.5