diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-23 16:45:17 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-23 16:45:44 +0000 |
commit | 17d6a993fc17d533460c5f40f3908c708e057c18 (patch) | |
tree | 1a3bd93e0ecd74fa02f93a528fe2f87e5314c4b5 /qa/suites/fs/workload | |
parent | Releasing progress-linux version 18.2.2-0progress7.99u1. (diff) | |
download | ceph-17d6a993fc17d533460c5f40f3908c708e057c18.tar.xz ceph-17d6a993fc17d533460c5f40f3908c708e057c18.zip |
Merging upstream version 18.2.3.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'qa/suites/fs/workload')
7 files changed, 34 insertions, 5 deletions
diff --git a/qa/suites/fs/workload/begin/3-modules.yaml b/qa/suites/fs/workload/begin/3-modules.yaml new file mode 120000 index 000000000..1eba706a5 --- /dev/null +++ b/qa/suites/fs/workload/begin/3-modules.yaml @@ -0,0 +1 @@ +.qa/cephfs/begin/3-modules.yaml
\ No newline at end of file diff --git a/qa/suites/fs/workload/ranks/1.yaml b/qa/suites/fs/workload/ranks/1.yaml index e69de29bb..f9e95daa9 100644 --- a/qa/suites/fs/workload/ranks/1.yaml +++ b/qa/suites/fs/workload/ranks/1.yaml @@ -0,0 +1,4 @@ +overrides: + ceph: + cephfs: + max_mds: 1 diff --git a/qa/suites/fs/workload/ranks/multi/balancer/automatic.yaml b/qa/suites/fs/workload/ranks/multi/balancer/automatic.yaml new file mode 100644 index 000000000..020eaa4bf --- /dev/null +++ b/qa/suites/fs/workload/ranks/multi/balancer/automatic.yaml @@ -0,0 +1,4 @@ +tasks: +- exec: + mon.a: + - ceph fs set cephfs balance_automate true diff --git a/qa/suites/fs/workload/ranks/multi/balancer/distributed.yaml.disabled b/qa/suites/fs/workload/ranks/multi/balancer/distributed.yaml.disabled new file mode 100644 index 000000000..be06d5186 --- /dev/null +++ b/qa/suites/fs/workload/ranks/multi/balancer/distributed.yaml.disabled @@ -0,0 +1,6 @@ +# distributed pins would be interesting if we had workloads on multiple clients. We do not yet. So it's disabled. +tasks: +- exec: + mon.a: + - ceph fs set cephfs balance_automate false + - ceph fs subvolumegroup pin cephfs qa distributed 1 diff --git a/qa/suites/fs/workload/ranks/multi/balancer/random.yaml b/qa/suites/fs/workload/ranks/multi/balancer/random.yaml new file mode 100644 index 000000000..977e83fc2 --- /dev/null +++ b/qa/suites/fs/workload/ranks/multi/balancer/random.yaml @@ -0,0 +1,10 @@ +overrides: + ceph: + conf: + mds: + mds_export_ephemeral_random_max: 0.10 +tasks: +- exec: + mon.a: + - ceph fs set cephfs balance_automate false + - ceph fs subvolumegroup pin cephfs qa random 0.10 diff --git a/qa/suites/fs/workload/tasks/0-subvolume/no-subvolume.yaml b/qa/suites/fs/workload/tasks/0-subvolume/no-subvolume.yaml deleted file mode 100644 index e69de29bb..000000000 --- a/qa/suites/fs/workload/tasks/0-subvolume/no-subvolume.yaml +++ /dev/null diff --git a/qa/suites/fs/workload/tasks/3-snaps/yes.yaml b/qa/suites/fs/workload/tasks/3-snaps/yes.yaml index 598f7e215..69f53768d 100644 --- a/qa/suites/fs/workload/tasks/3-snaps/yes.yaml +++ b/qa/suites/fs/workload/tasks/3-snaps/yes.yaml @@ -1,3 +1,10 @@ +mgrmodules: + sequential: + - exec: + mon.a: + - ceph mgr module enable snap_schedule + - ceph config set mgr mgr/snap_schedule/allow_m_granularity true + - ceph config set mgr mgr/snap_schedule/dump_on_update true overrides: ceph: conf: @@ -12,11 +19,8 @@ overrides: tasks: - exec: mon.a: - - ceph mgr module enable snap_schedule - - ceph config set mgr mgr/snap_schedule/allow_m_granularity true - - ceph config set mgr mgr/snap_schedule/dump_on_update true - - ceph fs snap-schedule add --fs=cephfs --path=/ --snap_schedule=1M - - ceph fs snap-schedule retention add --fs=cephfs --path=/ --retention-spec-or-period=6M3h + - ceph fs snap-schedule add --fs=cephfs --path=/ --snap_schedule=1m + - ceph fs snap-schedule retention add --fs=cephfs --path=/ --retention-spec-or-period=6m3h - ceph fs snap-schedule status --fs=cephfs --path=/ - ceph fs snap-schedule list --fs=cephfs --path=/ --recursive=true - date +%s > START_TIME |