From b9a1a3cdf9770bcb27d6e08ddbc059f01674f4b8 Mon Sep 17 00:00:00 2001 From: Jos Collin Date: Mon, 24 Jul 2023 14:16:52 +0530 Subject: [PATCH] qa: fix cephfs-mirror unwinding and 'fs volume create/rm' order * Fixes the 'fs volume create' happens before the cephfs-mirror daemon start. * Fixes the 'fs volume rm' happen only after the cephfs-mirror daemon unwinding. - This prevents the issue of mirror-daemon not returning from a libcephfs call, as the volumes were deleted during the cephfs_mirror_thrash ing. Fixes: https://tracker.ceph.com/issues/61182 Signed-off-by: Jos Collin --- qa/suites/fs/mirror-ha/cephfs-mirror/+ | 0 .../cephfs-mirror/1-volume-create-rm.yaml | 14 ++++++++++++++ ...e-per-cluster.yaml => 2-three-per-cluster.yaml} | 0 .../workloads/cephfs-mirror-ha-workunit.yaml | 11 ----------- 4 files changed, 14 insertions(+), 11 deletions(-) create mode 100644 qa/suites/fs/mirror-ha/cephfs-mirror/+ create mode 100644 qa/suites/fs/mirror-ha/cephfs-mirror/1-volume-create-rm.yaml rename qa/suites/fs/mirror-ha/cephfs-mirror/{three-per-cluster.yaml => 2-three-per-cluster.yaml} (100%) diff --git a/qa/suites/fs/mirror-ha/cephfs-mirror/+ b/qa/suites/fs/mirror-ha/cephfs-mirror/+ new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/qa/suites/fs/mirror-ha/cephfs-mirror/1-volume-create-rm.yaml b/qa/suites/fs/mirror-ha/cephfs-mirror/1-volume-create-rm.yaml new file mode 100644 index 0000000000000..4ee16e1c98369 --- /dev/null +++ b/qa/suites/fs/mirror-ha/cephfs-mirror/1-volume-create-rm.yaml @@ -0,0 +1,14 @@ +meta: +- desc: create/rm volumes and set configs + +tasks: + - exec: + mon.a: + - "ceph fs volume create dc" + - "ceph fs volume create dc-backup" + - full_sequential_finally: + - exec: + mon.a: + - ceph config set mon mon_allow_pool_delete true + - ceph fs volume rm dc --yes-i-really-mean-it + - ceph fs volume rm dc-backup --yes-i-really-mean-it diff --git a/qa/suites/fs/mirror-ha/cephfs-mirror/three-per-cluster.yaml b/qa/suites/fs/mirror-ha/cephfs-mirror/2-three-per-cluster.yaml similarity index 100% rename from qa/suites/fs/mirror-ha/cephfs-mirror/three-per-cluster.yaml rename to qa/suites/fs/mirror-ha/cephfs-mirror/2-three-per-cluster.yaml diff --git a/qa/suites/fs/mirror-ha/workloads/cephfs-mirror-ha-workunit.yaml b/qa/suites/fs/mirror-ha/workloads/cephfs-mirror-ha-workunit.yaml index f43a9a4ba7b25..ce4dddf78d51e 100644 --- a/qa/suites/fs/mirror-ha/workloads/cephfs-mirror-ha-workunit.yaml +++ b/qa/suites/fs/mirror-ha/workloads/cephfs-mirror-ha-workunit.yaml @@ -8,17 +8,6 @@ overrides: debug client: 10 tasks: - - exec: - mon.a: - - "ceph fs volume create dc" - - "ceph fs volume create dc-backup" - # Remove volumes during unwind to avoid MDS replacement warnings: - - full_sequential_finally: - - exec: - mon.a: - - ceph config set mon mon_allow_pool_delete true - - ceph fs volume rm dc --yes-i-really-mean-it - - ceph fs volume rm dc-backup --yes-i-really-mean-it - ceph-fuse: client.1: cephfs_name: dc -- 2.39.5