From: Patrick Donnelly <pdonnell@redhat.com>
Date: Mon, 29 Mar 2021 22:08:28 +0000 (-0700)
Subject: qa: test standby-replay with fs:workloads
X-Git-Tag: v17.1.0~2302^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=4702be4f47fa5470488a905faee669c49397caa2;p=ceph.git

qa: test standby-replay with fs:workloads

Fixes: https://tracker.ceph.com/issues/50045
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
---

diff --git a/qa/cephfs/clusters/1a11s-mds-1c-client-3node.yaml b/qa/cephfs/clusters/1a11s-mds-1c-client-3node.yaml
new file mode 100644
index 0000000000000..ca6f79ba29a88
--- /dev/null
+++ b/qa/cephfs/clusters/1a11s-mds-1c-client-3node.yaml
@@ -0,0 +1,10 @@
+roles:
+- [mon.a, mgr.x, mds.a, mds.d, mds.g, mds.j, osd.0, osd.3, osd.6, osd.9, client.0]
+- [mon.b, mgr.y, mds.b, mds.e, mds.h, mds.k, osd.1, osd.4, osd.7, osd.10]
+- [mon.c, mgr.z, mds.c, mds.f, mds.i, mds.l, osd.2, osd.5, osd.8, osd.11]
+openstack:
+- volumes: # attached to each instance
+    count: 4
+    size: 20 # GB
+- machine:
+    disk: 200 # GB
diff --git a/qa/suites/fs/workload/clusters/1a11s-mds-1c-client-3node.yaml b/qa/suites/fs/workload/clusters/1a11s-mds-1c-client-3node.yaml
new file mode 120000
index 0000000000000..88413457386da
--- /dev/null
+++ b/qa/suites/fs/workload/clusters/1a11s-mds-1c-client-3node.yaml
@@ -0,0 +1 @@
+.qa/cephfs/clusters/1a11s-mds-1c-client-3node.yaml
\ No newline at end of file
diff --git a/qa/suites/fs/workload/clusters/1a5s-mds-1c-client-3node.yaml b/qa/suites/fs/workload/clusters/1a5s-mds-1c-client-3node.yaml
deleted file mode 120000
index e8ff97a0a21a5..0000000000000
--- a/qa/suites/fs/workload/clusters/1a5s-mds-1c-client-3node.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/cephfs/clusters/1a5s-mds-1c-client-3node.yaml
\ No newline at end of file
diff --git a/qa/suites/fs/workload/standby-replay.yaml b/qa/suites/fs/workload/standby-replay.yaml
new file mode 100644
index 0000000000000..b47d312bf35af
--- /dev/null
+++ b/qa/suites/fs/workload/standby-replay.yaml
@@ -0,0 +1,4 @@
+overrides:
+  ceph:
+    cephfs:
+      standby_replay: true
diff --git a/qa/tasks/cephfs/filesystem.py b/qa/tasks/cephfs/filesystem.py
index 52644634b9609..34ee42f13ec6d 100644
--- a/qa/tasks/cephfs/filesystem.py
+++ b/qa/tasks/cephfs/filesystem.py
@@ -683,6 +683,9 @@ class Filesystem(MDSCluster):
             if max_mds > 1:
                 self.set_max_mds(max_mds)
 
+            standby_replay = self.fs_config.get('standby_replay', False)
+            self.set_allow_standby_replay(standby_replay)
+
             # If absent will use the default value (60 seconds)
             session_timeout = self.fs_config.get('session_timeout', 60)
             if session_timeout != 60: