From: Jos Collin <jcollin@redhat.com>
Date: Mon, 24 Jul 2023 08:46:52 +0000 (+0530)
Subject: qa: fix cephfs-mirror unwinding and 'fs volume create/rm' order
X-Git-Tag: v19.0.0~802^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F52600%2Fhead;p=ceph.git

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 <jcollin@redhat.com>
---

diff --git a/qa/suites/fs/mirror-ha/cephfs-mirror/+ b/qa/suites/fs/mirror-ha/cephfs-mirror/+
new file mode 100644
index 000000000000..e69de29bb2d1
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 000000000000..4ee16e1c9836
--- /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/2-three-per-cluster.yaml b/qa/suites/fs/mirror-ha/cephfs-mirror/2-three-per-cluster.yaml
new file mode 100644
index 000000000000..095f0893ac26
--- /dev/null
+++ b/qa/suites/fs/mirror-ha/cephfs-mirror/2-three-per-cluster.yaml
@@ -0,0 +1,12 @@
+meta:
+- desc: run one cephfs-mirror daemon on primary cluster
+tasks:
+- cephfs-mirror:
+    client: client.mirror1
+    run_in_foreground: True
+- cephfs-mirror:
+    client: client.mirror2
+    run_in_foreground: True
+- cephfs-mirror:
+    client: client.mirror3
+    run_in_foreground: True
diff --git a/qa/suites/fs/mirror-ha/cephfs-mirror/three-per-cluster.yaml b/qa/suites/fs/mirror-ha/cephfs-mirror/three-per-cluster.yaml
deleted file mode 100644
index 095f0893ac26..000000000000
--- a/qa/suites/fs/mirror-ha/cephfs-mirror/three-per-cluster.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-meta:
-- desc: run one cephfs-mirror daemon on primary cluster
-tasks:
-- cephfs-mirror:
-    client: client.mirror1
-    run_in_foreground: True
-- cephfs-mirror:
-    client: client.mirror2
-    run_in_foreground: True
-- cephfs-mirror:
-    client: client.mirror3
-    run_in_foreground: True
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 f43a9a4ba7b2..ce4dddf78d51 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