From: Patrick Donnelly Date: Thu, 6 Jan 2022 15:51:03 +0000 (-0500) Subject: qa: reduce fs:workload use of random selection X-Git-Tag: v18.0.0~814^2^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c2f132140d569110a8bdbe496aae5a7087fd4872;p=ceph.git qa: reduce fs:workload use of random selection It's more appropriate to use --subset to reduce the scheduling size. It was previously laid out this way because we wanted to link to the common `qa/cephfs/mount` directory so that ceph-fuse mounts are not needlessly multiplied. We should just organize it correctly so that is not an issue. Signed-off-by: Patrick Donnelly --- diff --git a/qa/suites/fs/workload/begin/.qa b/qa/suites/fs/workload/begin/.qa index fea2489fdf6d..a602a0353e75 120000 --- a/qa/suites/fs/workload/begin/.qa +++ b/qa/suites/fs/workload/begin/.qa @@ -1 +1 @@ -../.qa \ No newline at end of file +../.qa/ \ No newline at end of file diff --git a/qa/suites/fs/workload/mount b/qa/suites/fs/workload/mount deleted file mode 120000 index e3600f453f2f..000000000000 --- a/qa/suites/fs/workload/mount +++ /dev/null @@ -1 +0,0 @@ -.qa/cephfs/mount/ \ No newline at end of file diff --git a/qa/suites/fs/workload/mount/.qa b/qa/suites/fs/workload/mount/.qa new file mode 120000 index 000000000000..a602a0353e75 --- /dev/null +++ b/qa/suites/fs/workload/mount/.qa @@ -0,0 +1 @@ +../.qa/ \ No newline at end of file diff --git a/qa/suites/fs/workload/mount/fuse.yaml b/qa/suites/fs/workload/mount/fuse.yaml new file mode 120000 index 000000000000..0e55da9fb7ab --- /dev/null +++ b/qa/suites/fs/workload/mount/fuse.yaml @@ -0,0 +1 @@ +.qa/cephfs/mount/fuse.yaml \ No newline at end of file diff --git a/qa/suites/fs/workload/mount/kclient/% b/qa/suites/fs/workload/mount/kclient/% new file mode 100644 index 000000000000..b8626c4cff28 --- /dev/null +++ b/qa/suites/fs/workload/mount/kclient/% @@ -0,0 +1 @@ +4 diff --git a/qa/suites/fs/workload/mount/kclient/.qa b/qa/suites/fs/workload/mount/kclient/.qa new file mode 120000 index 000000000000..a602a0353e75 --- /dev/null +++ b/qa/suites/fs/workload/mount/kclient/.qa @@ -0,0 +1 @@ +../.qa/ \ No newline at end of file diff --git a/qa/suites/fs/workload/mount/kclient/base b/qa/suites/fs/workload/mount/kclient/base new file mode 120000 index 000000000000..22f94e1509bc --- /dev/null +++ b/qa/suites/fs/workload/mount/kclient/base @@ -0,0 +1 @@ +.qa/cephfs/mount/kclient/ \ No newline at end of file diff --git a/qa/suites/fs/workload/mount/kclient/ms_mode/.qa b/qa/suites/fs/workload/mount/kclient/ms_mode/.qa new file mode 120000 index 000000000000..a602a0353e75 --- /dev/null +++ b/qa/suites/fs/workload/mount/kclient/ms_mode/.qa @@ -0,0 +1 @@ +../.qa/ \ No newline at end of file diff --git a/qa/suites/fs/workload/mount/kclient/ms_mode/crc.yaml b/qa/suites/fs/workload/mount/kclient/ms_mode/crc.yaml new file mode 100644 index 000000000000..7efada467b33 --- /dev/null +++ b/qa/suites/fs/workload/mount/kclient/ms_mode/crc.yaml @@ -0,0 +1,3 @@ +overrides: + kclient: + mntopts: ["ms_mode=crc"] diff --git a/qa/suites/fs/workload/mount/kclient/ms_mode/legacy.yaml b/qa/suites/fs/workload/mount/kclient/ms_mode/legacy.yaml new file mode 100644 index 000000000000..8a68a7756681 --- /dev/null +++ b/qa/suites/fs/workload/mount/kclient/ms_mode/legacy.yaml @@ -0,0 +1,3 @@ +overrides: + kclient: + mntopts: ["ms_mode=legacy"] diff --git a/qa/suites/fs/workload/mount/kclient/ms_mode/secure.yaml b/qa/suites/fs/workload/mount/kclient/ms_mode/secure.yaml new file mode 100644 index 000000000000..b4a4221d51dd --- /dev/null +++ b/qa/suites/fs/workload/mount/kclient/ms_mode/secure.yaml @@ -0,0 +1,3 @@ +overrides: + kclient: + mntopts: ["ms_mode=secure"] diff --git a/qa/suites/fs/workload/mount/kclient/wsync/.qa b/qa/suites/fs/workload/mount/kclient/wsync/.qa new file mode 120000 index 000000000000..a602a0353e75 --- /dev/null +++ b/qa/suites/fs/workload/mount/kclient/wsync/.qa @@ -0,0 +1 @@ +../.qa/ \ No newline at end of file diff --git a/qa/suites/fs/workload/mount/kclient/wsync/no.yaml b/qa/suites/fs/workload/mount/kclient/wsync/no.yaml new file mode 100644 index 000000000000..1ed9e99532f6 --- /dev/null +++ b/qa/suites/fs/workload/mount/kclient/wsync/no.yaml @@ -0,0 +1,3 @@ +overrides: + kclient: + mntopts: ["nowsync"] diff --git a/qa/suites/fs/workload/mount/kclient/wsync/yes.yaml b/qa/suites/fs/workload/mount/kclient/wsync/yes.yaml new file mode 100644 index 000000000000..2061bac11d99 --- /dev/null +++ b/qa/suites/fs/workload/mount/kclient/wsync/yes.yaml @@ -0,0 +1,3 @@ +overrides: + kclient: + mntopts: ["wsync"] diff --git a/qa/suites/fs/workload/ms_mode/$ b/qa/suites/fs/workload/ms_mode/$ deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/qa/suites/fs/workload/ms_mode/.qa b/qa/suites/fs/workload/ms_mode/.qa deleted file mode 120000 index a602a0353e75..000000000000 --- a/qa/suites/fs/workload/ms_mode/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa/ \ No newline at end of file diff --git a/qa/suites/fs/workload/ms_mode/crc.yaml b/qa/suites/fs/workload/ms_mode/crc.yaml deleted file mode 100644 index 7efada467b33..000000000000 --- a/qa/suites/fs/workload/ms_mode/crc.yaml +++ /dev/null @@ -1,3 +0,0 @@ -overrides: - kclient: - mntopts: ["ms_mode=crc"] diff --git a/qa/suites/fs/workload/ms_mode/legacy.yaml b/qa/suites/fs/workload/ms_mode/legacy.yaml deleted file mode 100644 index 8a68a7756681..000000000000 --- a/qa/suites/fs/workload/ms_mode/legacy.yaml +++ /dev/null @@ -1,3 +0,0 @@ -overrides: - kclient: - mntopts: ["ms_mode=legacy"] diff --git a/qa/suites/fs/workload/ms_mode/secure.yaml b/qa/suites/fs/workload/ms_mode/secure.yaml deleted file mode 100644 index b4a4221d51dd..000000000000 --- a/qa/suites/fs/workload/ms_mode/secure.yaml +++ /dev/null @@ -1,3 +0,0 @@ -overrides: - kclient: - mntopts: ["ms_mode=secure"] diff --git a/qa/suites/fs/workload/wsync/$ b/qa/suites/fs/workload/wsync/$ deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/qa/suites/fs/workload/wsync/.qa b/qa/suites/fs/workload/wsync/.qa deleted file mode 120000 index a602a0353e75..000000000000 --- a/qa/suites/fs/workload/wsync/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa/ \ No newline at end of file diff --git a/qa/suites/fs/workload/wsync/no.yaml b/qa/suites/fs/workload/wsync/no.yaml deleted file mode 100644 index 1ed9e99532f6..000000000000 --- a/qa/suites/fs/workload/wsync/no.yaml +++ /dev/null @@ -1,3 +0,0 @@ -overrides: - kclient: - mntopts: ["nowsync"] diff --git a/qa/suites/fs/workload/wsync/yes.yaml b/qa/suites/fs/workload/wsync/yes.yaml deleted file mode 100644 index 2061bac11d99..000000000000 --- a/qa/suites/fs/workload/wsync/yes.yaml +++ /dev/null @@ -1,3 +0,0 @@ -overrides: - kclient: - mntopts: ["wsync"]