From 9d4df3856f05b00ccdedaa26abc055a260f3dff2 Mon Sep 17 00:00:00 2001
From: Ilya Dryomov <idryomov@gmail.com>
Date: Wed, 20 Jan 2021 16:00:18 +0100
Subject: [PATCH] qa/suites/krbd: add msgr2 modes to most subsuites

basic, rbd and rbd-nomount subsuites are expanded to run with each
of ms_mode=legacy, ms_mode=crc and ms_mode=secure.  This increases
the total number of jobs in the suite from 100 to 220.

fsx, singleton and thrash subsuites choose ms_mode at random (from
the above plus ms_mode=prefer-crc).

unmap and wac subsuites remain msgr1-only.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit 65948736a41f424d8152b208d013419f8d6038a4)
---
 qa/suites/krbd/basic/ms_mode/.qa                  | 1 +
 qa/suites/krbd/basic/ms_mode/crc.yaml             | 5 +++++
 qa/suites/krbd/basic/ms_mode/legacy.yaml          | 5 +++++
 qa/suites/krbd/basic/ms_mode/secure.yaml          | 5 +++++
 qa/suites/krbd/fsx/conf.yaml                      | 2 --
 qa/suites/krbd/fsx/ms_mode$/.qa                   | 1 +
 qa/suites/krbd/fsx/ms_mode$/crc.yaml              | 5 +++++
 qa/suites/krbd/fsx/ms_mode$/legacy.yaml           | 5 +++++
 qa/suites/krbd/fsx/ms_mode$/prefer-crc.yaml       | 5 +++++
 qa/suites/krbd/fsx/ms_mode$/secure.yaml           | 5 +++++
 qa/suites/krbd/rbd-nomount/ms_mode/.qa            | 1 +
 qa/suites/krbd/rbd-nomount/ms_mode/crc.yaml       | 5 +++++
 qa/suites/krbd/rbd-nomount/ms_mode/legacy.yaml    | 5 +++++
 qa/suites/krbd/rbd-nomount/ms_mode/secure.yaml    | 5 +++++
 qa/suites/krbd/rbd/ms_mode/.qa                    | 1 +
 qa/suites/krbd/rbd/ms_mode/crc.yaml               | 5 +++++
 qa/suites/krbd/rbd/ms_mode/legacy.yaml            | 5 +++++
 qa/suites/krbd/rbd/ms_mode/secure.yaml            | 5 +++++
 qa/suites/krbd/singleton/ms_mode$/.qa             | 1 +
 qa/suites/krbd/singleton/ms_mode$/crc.yaml        | 5 +++++
 qa/suites/krbd/singleton/ms_mode$/legacy.yaml     | 5 +++++
 qa/suites/krbd/singleton/ms_mode$/prefer-crc.yaml | 5 +++++
 qa/suites/krbd/singleton/ms_mode$/secure.yaml     | 5 +++++
 qa/suites/krbd/thrash/ms_mode$/.qa                | 1 +
 qa/suites/krbd/thrash/ms_mode$/crc.yaml           | 5 +++++
 qa/suites/krbd/thrash/ms_mode$/legacy.yaml        | 5 +++++
 qa/suites/krbd/thrash/ms_mode$/prefer-crc.yaml    | 5 +++++
 qa/suites/krbd/thrash/ms_mode$/secure.yaml        | 5 +++++
 28 files changed, 111 insertions(+), 2 deletions(-)
 create mode 120000 qa/suites/krbd/basic/ms_mode/.qa
 create mode 100644 qa/suites/krbd/basic/ms_mode/crc.yaml
 create mode 100644 qa/suites/krbd/basic/ms_mode/legacy.yaml
 create mode 100644 qa/suites/krbd/basic/ms_mode/secure.yaml
 create mode 120000 qa/suites/krbd/fsx/ms_mode$/.qa
 create mode 100644 qa/suites/krbd/fsx/ms_mode$/crc.yaml
 create mode 100644 qa/suites/krbd/fsx/ms_mode$/legacy.yaml
 create mode 100644 qa/suites/krbd/fsx/ms_mode$/prefer-crc.yaml
 create mode 100644 qa/suites/krbd/fsx/ms_mode$/secure.yaml
 create mode 120000 qa/suites/krbd/rbd-nomount/ms_mode/.qa
 create mode 100644 qa/suites/krbd/rbd-nomount/ms_mode/crc.yaml
 create mode 100644 qa/suites/krbd/rbd-nomount/ms_mode/legacy.yaml
 create mode 100644 qa/suites/krbd/rbd-nomount/ms_mode/secure.yaml
 create mode 120000 qa/suites/krbd/rbd/ms_mode/.qa
 create mode 100644 qa/suites/krbd/rbd/ms_mode/crc.yaml
 create mode 100644 qa/suites/krbd/rbd/ms_mode/legacy.yaml
 create mode 100644 qa/suites/krbd/rbd/ms_mode/secure.yaml
 create mode 120000 qa/suites/krbd/singleton/ms_mode$/.qa
 create mode 100644 qa/suites/krbd/singleton/ms_mode$/crc.yaml
 create mode 100644 qa/suites/krbd/singleton/ms_mode$/legacy.yaml
 create mode 100644 qa/suites/krbd/singleton/ms_mode$/prefer-crc.yaml
 create mode 100644 qa/suites/krbd/singleton/ms_mode$/secure.yaml
 create mode 120000 qa/suites/krbd/thrash/ms_mode$/.qa
 create mode 100644 qa/suites/krbd/thrash/ms_mode$/crc.yaml
 create mode 100644 qa/suites/krbd/thrash/ms_mode$/legacy.yaml
 create mode 100644 qa/suites/krbd/thrash/ms_mode$/prefer-crc.yaml
 create mode 100644 qa/suites/krbd/thrash/ms_mode$/secure.yaml

diff --git a/qa/suites/krbd/basic/ms_mode/.qa b/qa/suites/krbd/basic/ms_mode/.qa
new file mode 120000
index 0000000000000..a602a0353e751
--- /dev/null
+++ b/qa/suites/krbd/basic/ms_mode/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file
diff --git a/qa/suites/krbd/basic/ms_mode/crc.yaml b/qa/suites/krbd/basic/ms_mode/crc.yaml
new file mode 100644
index 0000000000000..3b072578f1fde
--- /dev/null
+++ b/qa/suites/krbd/basic/ms_mode/crc.yaml
@@ -0,0 +1,5 @@
+overrides:
+  ceph:
+    conf:
+      client:
+        rbd default map options: ms_mode=crc
diff --git a/qa/suites/krbd/basic/ms_mode/legacy.yaml b/qa/suites/krbd/basic/ms_mode/legacy.yaml
new file mode 100644
index 0000000000000..0048dcb0cec2a
--- /dev/null
+++ b/qa/suites/krbd/basic/ms_mode/legacy.yaml
@@ -0,0 +1,5 @@
+overrides:
+  ceph:
+    conf:
+      client:
+        rbd default map options: ms_mode=legacy
diff --git a/qa/suites/krbd/basic/ms_mode/secure.yaml b/qa/suites/krbd/basic/ms_mode/secure.yaml
new file mode 100644
index 0000000000000..a735db18d2c30
--- /dev/null
+++ b/qa/suites/krbd/basic/ms_mode/secure.yaml
@@ -0,0 +1,5 @@
+overrides:
+  ceph:
+    conf:
+      client:
+        rbd default map options: ms_mode=secure
diff --git a/qa/suites/krbd/fsx/conf.yaml b/qa/suites/krbd/fsx/conf.yaml
index d4863aa51be08..30da870b25df9 100644
--- a/qa/suites/krbd/fsx/conf.yaml
+++ b/qa/suites/krbd/fsx/conf.yaml
@@ -3,5 +3,3 @@ overrides:
     conf:
       global:
         ms die on skipped message: false
-      client:
-        rbd default map options: read_from_replica=balance
diff --git a/qa/suites/krbd/fsx/ms_mode$/.qa b/qa/suites/krbd/fsx/ms_mode$/.qa
new file mode 120000
index 0000000000000..a602a0353e751
--- /dev/null
+++ b/qa/suites/krbd/fsx/ms_mode$/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file
diff --git a/qa/suites/krbd/fsx/ms_mode$/crc.yaml b/qa/suites/krbd/fsx/ms_mode$/crc.yaml
new file mode 100644
index 0000000000000..d11be38876a01
--- /dev/null
+++ b/qa/suites/krbd/fsx/ms_mode$/crc.yaml
@@ -0,0 +1,5 @@
+overrides:
+  ceph:
+    conf:
+      client:
+        rbd default map options: ms_mode=crc,read_from_replica=balance
diff --git a/qa/suites/krbd/fsx/ms_mode$/legacy.yaml b/qa/suites/krbd/fsx/ms_mode$/legacy.yaml
new file mode 100644
index 0000000000000..2b7116c034835
--- /dev/null
+++ b/qa/suites/krbd/fsx/ms_mode$/legacy.yaml
@@ -0,0 +1,5 @@
+overrides:
+  ceph:
+    conf:
+      client:
+        rbd default map options: ms_mode=legacy,read_from_replica=balance
diff --git a/qa/suites/krbd/fsx/ms_mode$/prefer-crc.yaml b/qa/suites/krbd/fsx/ms_mode$/prefer-crc.yaml
new file mode 100644
index 0000000000000..a346c75489201
--- /dev/null
+++ b/qa/suites/krbd/fsx/ms_mode$/prefer-crc.yaml
@@ -0,0 +1,5 @@
+overrides:
+  ceph:
+    conf:
+      client:
+        rbd default map options: ms_mode=prefer-crc,read_from_replica=balance
diff --git a/qa/suites/krbd/fsx/ms_mode$/secure.yaml b/qa/suites/krbd/fsx/ms_mode$/secure.yaml
new file mode 100644
index 0000000000000..671b73f9c6bc5
--- /dev/null
+++ b/qa/suites/krbd/fsx/ms_mode$/secure.yaml
@@ -0,0 +1,5 @@
+overrides:
+  ceph:
+    conf:
+      client:
+        rbd default map options: ms_mode=secure,read_from_replica=balance
diff --git a/qa/suites/krbd/rbd-nomount/ms_mode/.qa b/qa/suites/krbd/rbd-nomount/ms_mode/.qa
new file mode 120000
index 0000000000000..a602a0353e751
--- /dev/null
+++ b/qa/suites/krbd/rbd-nomount/ms_mode/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file
diff --git a/qa/suites/krbd/rbd-nomount/ms_mode/crc.yaml b/qa/suites/krbd/rbd-nomount/ms_mode/crc.yaml
new file mode 100644
index 0000000000000..3b072578f1fde
--- /dev/null
+++ b/qa/suites/krbd/rbd-nomount/ms_mode/crc.yaml
@@ -0,0 +1,5 @@
+overrides:
+  ceph:
+    conf:
+      client:
+        rbd default map options: ms_mode=crc
diff --git a/qa/suites/krbd/rbd-nomount/ms_mode/legacy.yaml b/qa/suites/krbd/rbd-nomount/ms_mode/legacy.yaml
new file mode 100644
index 0000000000000..0048dcb0cec2a
--- /dev/null
+++ b/qa/suites/krbd/rbd-nomount/ms_mode/legacy.yaml
@@ -0,0 +1,5 @@
+overrides:
+  ceph:
+    conf:
+      client:
+        rbd default map options: ms_mode=legacy
diff --git a/qa/suites/krbd/rbd-nomount/ms_mode/secure.yaml b/qa/suites/krbd/rbd-nomount/ms_mode/secure.yaml
new file mode 100644
index 0000000000000..a735db18d2c30
--- /dev/null
+++ b/qa/suites/krbd/rbd-nomount/ms_mode/secure.yaml
@@ -0,0 +1,5 @@
+overrides:
+  ceph:
+    conf:
+      client:
+        rbd default map options: ms_mode=secure
diff --git a/qa/suites/krbd/rbd/ms_mode/.qa b/qa/suites/krbd/rbd/ms_mode/.qa
new file mode 120000
index 0000000000000..a602a0353e751
--- /dev/null
+++ b/qa/suites/krbd/rbd/ms_mode/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file
diff --git a/qa/suites/krbd/rbd/ms_mode/crc.yaml b/qa/suites/krbd/rbd/ms_mode/crc.yaml
new file mode 100644
index 0000000000000..3b072578f1fde
--- /dev/null
+++ b/qa/suites/krbd/rbd/ms_mode/crc.yaml
@@ -0,0 +1,5 @@
+overrides:
+  ceph:
+    conf:
+      client:
+        rbd default map options: ms_mode=crc
diff --git a/qa/suites/krbd/rbd/ms_mode/legacy.yaml b/qa/suites/krbd/rbd/ms_mode/legacy.yaml
new file mode 100644
index 0000000000000..0048dcb0cec2a
--- /dev/null
+++ b/qa/suites/krbd/rbd/ms_mode/legacy.yaml
@@ -0,0 +1,5 @@
+overrides:
+  ceph:
+    conf:
+      client:
+        rbd default map options: ms_mode=legacy
diff --git a/qa/suites/krbd/rbd/ms_mode/secure.yaml b/qa/suites/krbd/rbd/ms_mode/secure.yaml
new file mode 100644
index 0000000000000..a735db18d2c30
--- /dev/null
+++ b/qa/suites/krbd/rbd/ms_mode/secure.yaml
@@ -0,0 +1,5 @@
+overrides:
+  ceph:
+    conf:
+      client:
+        rbd default map options: ms_mode=secure
diff --git a/qa/suites/krbd/singleton/ms_mode$/.qa b/qa/suites/krbd/singleton/ms_mode$/.qa
new file mode 120000
index 0000000000000..a602a0353e751
--- /dev/null
+++ b/qa/suites/krbd/singleton/ms_mode$/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file
diff --git a/qa/suites/krbd/singleton/ms_mode$/crc.yaml b/qa/suites/krbd/singleton/ms_mode$/crc.yaml
new file mode 100644
index 0000000000000..3b072578f1fde
--- /dev/null
+++ b/qa/suites/krbd/singleton/ms_mode$/crc.yaml
@@ -0,0 +1,5 @@
+overrides:
+  ceph:
+    conf:
+      client:
+        rbd default map options: ms_mode=crc
diff --git a/qa/suites/krbd/singleton/ms_mode$/legacy.yaml b/qa/suites/krbd/singleton/ms_mode$/legacy.yaml
new file mode 100644
index 0000000000000..0048dcb0cec2a
--- /dev/null
+++ b/qa/suites/krbd/singleton/ms_mode$/legacy.yaml
@@ -0,0 +1,5 @@
+overrides:
+  ceph:
+    conf:
+      client:
+        rbd default map options: ms_mode=legacy
diff --git a/qa/suites/krbd/singleton/ms_mode$/prefer-crc.yaml b/qa/suites/krbd/singleton/ms_mode$/prefer-crc.yaml
new file mode 100644
index 0000000000000..1054473af1862
--- /dev/null
+++ b/qa/suites/krbd/singleton/ms_mode$/prefer-crc.yaml
@@ -0,0 +1,5 @@
+overrides:
+  ceph:
+    conf:
+      client:
+        rbd default map options: ms_mode=prefer-crc
diff --git a/qa/suites/krbd/singleton/ms_mode$/secure.yaml b/qa/suites/krbd/singleton/ms_mode$/secure.yaml
new file mode 100644
index 0000000000000..a735db18d2c30
--- /dev/null
+++ b/qa/suites/krbd/singleton/ms_mode$/secure.yaml
@@ -0,0 +1,5 @@
+overrides:
+  ceph:
+    conf:
+      client:
+        rbd default map options: ms_mode=secure
diff --git a/qa/suites/krbd/thrash/ms_mode$/.qa b/qa/suites/krbd/thrash/ms_mode$/.qa
new file mode 120000
index 0000000000000..a602a0353e751
--- /dev/null
+++ b/qa/suites/krbd/thrash/ms_mode$/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file
diff --git a/qa/suites/krbd/thrash/ms_mode$/crc.yaml b/qa/suites/krbd/thrash/ms_mode$/crc.yaml
new file mode 100644
index 0000000000000..3b072578f1fde
--- /dev/null
+++ b/qa/suites/krbd/thrash/ms_mode$/crc.yaml
@@ -0,0 +1,5 @@
+overrides:
+  ceph:
+    conf:
+      client:
+        rbd default map options: ms_mode=crc
diff --git a/qa/suites/krbd/thrash/ms_mode$/legacy.yaml b/qa/suites/krbd/thrash/ms_mode$/legacy.yaml
new file mode 100644
index 0000000000000..0048dcb0cec2a
--- /dev/null
+++ b/qa/suites/krbd/thrash/ms_mode$/legacy.yaml
@@ -0,0 +1,5 @@
+overrides:
+  ceph:
+    conf:
+      client:
+        rbd default map options: ms_mode=legacy
diff --git a/qa/suites/krbd/thrash/ms_mode$/prefer-crc.yaml b/qa/suites/krbd/thrash/ms_mode$/prefer-crc.yaml
new file mode 100644
index 0000000000000..1054473af1862
--- /dev/null
+++ b/qa/suites/krbd/thrash/ms_mode$/prefer-crc.yaml
@@ -0,0 +1,5 @@
+overrides:
+  ceph:
+    conf:
+      client:
+        rbd default map options: ms_mode=prefer-crc
diff --git a/qa/suites/krbd/thrash/ms_mode$/secure.yaml b/qa/suites/krbd/thrash/ms_mode$/secure.yaml
new file mode 100644
index 0000000000000..a735db18d2c30
--- /dev/null
+++ b/qa/suites/krbd/thrash/ms_mode$/secure.yaml
@@ -0,0 +1,5 @@
+overrides:
+  ceph:
+    conf:
+      client:
+        rbd default map options: ms_mode=secure
-- 
2.39.5