From fbf8c1d68be60ab294719113edbd7f459a755c15 Mon Sep 17 00:00:00 2001
From: Ilya Dryomov <idryomov@gmail.com>
Date: Mon, 31 Jan 2022 14:08:26 +0100
Subject: [PATCH] qa/suites/krbd: add legacy+rxbounce and crc+rxbounce coverage

For basic, rbd and rbd-nomount subsuites, replace legacy and crc
facets with "legacy or legacy+rxbounce" and "crc or crc+rxbounce"
facets (chosen at random).

For fsx, singleton and thrash subsuites, add legacy+rxbounce and
crc+rxbounce facets and drop prefer-crc facet.  The expected behaviour
of the latter depends on cluster configuration and should be tested
separately.

The total number of jobs remains the same.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
---
 qa/suites/krbd/basic/ms_mode/crc$/.qa                        | 1 +
 qa/suites/krbd/basic/ms_mode/crc$/crc-rxbounce.yaml          | 5 +++++
 qa/suites/krbd/basic/ms_mode/{ => crc$}/crc.yaml             | 0
 qa/suites/krbd/basic/ms_mode/legacy$/.qa                     | 1 +
 qa/suites/krbd/basic/ms_mode/legacy$/legacy-rxbounce.yaml    | 5 +++++
 qa/suites/krbd/basic/ms_mode/{ => legacy$}/legacy.yaml       | 0
 qa/suites/krbd/fsx/ms_mode$/crc-rxbounce.yaml                | 5 +++++
 qa/suites/krbd/fsx/ms_mode$/legacy-rxbounce.yaml             | 5 +++++
 qa/suites/krbd/fsx/ms_mode$/prefer-crc.yaml                  | 5 -----
 qa/suites/krbd/rbd-nomount/ms_mode/crc$/.qa                  | 1 +
 qa/suites/krbd/rbd-nomount/ms_mode/crc$/crc-rxbounce.yaml    | 5 +++++
 qa/suites/krbd/rbd-nomount/ms_mode/{ => crc$}/crc.yaml       | 0
 qa/suites/krbd/rbd-nomount/ms_mode/legacy$/.qa               | 1 +
 .../krbd/rbd-nomount/ms_mode/legacy$/legacy-rxbounce.yaml    | 5 +++++
 qa/suites/krbd/rbd-nomount/ms_mode/{ => legacy$}/legacy.yaml | 0
 qa/suites/krbd/rbd/ms_mode/crc$/.qa                          | 1 +
 qa/suites/krbd/rbd/ms_mode/crc$/crc-rxbounce.yaml            | 5 +++++
 qa/suites/krbd/rbd/ms_mode/{ => crc$}/crc.yaml               | 0
 qa/suites/krbd/rbd/ms_mode/legacy$/.qa                       | 1 +
 qa/suites/krbd/rbd/ms_mode/legacy$/legacy-rxbounce.yaml      | 5 +++++
 qa/suites/krbd/rbd/ms_mode/{ => legacy$}/legacy.yaml         | 0
 qa/suites/krbd/singleton/ms_mode$/crc-rxbounce.yaml          | 5 +++++
 qa/suites/krbd/singleton/ms_mode$/legacy-rxbounce.yaml       | 5 +++++
 qa/suites/krbd/singleton/ms_mode$/prefer-crc.yaml            | 5 -----
 qa/suites/krbd/thrash/ms_mode$/crc-rxbounce.yaml             | 5 +++++
 qa/suites/krbd/thrash/ms_mode$/legacy-rxbounce.yaml          | 5 +++++
 qa/suites/krbd/thrash/ms_mode$/prefer-crc.yaml               | 5 -----
 27 files changed, 66 insertions(+), 15 deletions(-)
 create mode 120000 qa/suites/krbd/basic/ms_mode/crc$/.qa
 create mode 100644 qa/suites/krbd/basic/ms_mode/crc$/crc-rxbounce.yaml
 rename qa/suites/krbd/basic/ms_mode/{ => crc$}/crc.yaml (100%)
 create mode 120000 qa/suites/krbd/basic/ms_mode/legacy$/.qa
 create mode 100644 qa/suites/krbd/basic/ms_mode/legacy$/legacy-rxbounce.yaml
 rename qa/suites/krbd/basic/ms_mode/{ => legacy$}/legacy.yaml (100%)
 create mode 100644 qa/suites/krbd/fsx/ms_mode$/crc-rxbounce.yaml
 create mode 100644 qa/suites/krbd/fsx/ms_mode$/legacy-rxbounce.yaml
 delete mode 100644 qa/suites/krbd/fsx/ms_mode$/prefer-crc.yaml
 create mode 120000 qa/suites/krbd/rbd-nomount/ms_mode/crc$/.qa
 create mode 100644 qa/suites/krbd/rbd-nomount/ms_mode/crc$/crc-rxbounce.yaml
 rename qa/suites/krbd/rbd-nomount/ms_mode/{ => crc$}/crc.yaml (100%)
 create mode 120000 qa/suites/krbd/rbd-nomount/ms_mode/legacy$/.qa
 create mode 100644 qa/suites/krbd/rbd-nomount/ms_mode/legacy$/legacy-rxbounce.yaml
 rename qa/suites/krbd/rbd-nomount/ms_mode/{ => legacy$}/legacy.yaml (100%)
 create mode 120000 qa/suites/krbd/rbd/ms_mode/crc$/.qa
 create mode 100644 qa/suites/krbd/rbd/ms_mode/crc$/crc-rxbounce.yaml
 rename qa/suites/krbd/rbd/ms_mode/{ => crc$}/crc.yaml (100%)
 create mode 120000 qa/suites/krbd/rbd/ms_mode/legacy$/.qa
 create mode 100644 qa/suites/krbd/rbd/ms_mode/legacy$/legacy-rxbounce.yaml
 rename qa/suites/krbd/rbd/ms_mode/{ => legacy$}/legacy.yaml (100%)
 create mode 100644 qa/suites/krbd/singleton/ms_mode$/crc-rxbounce.yaml
 create mode 100644 qa/suites/krbd/singleton/ms_mode$/legacy-rxbounce.yaml
 delete mode 100644 qa/suites/krbd/singleton/ms_mode$/prefer-crc.yaml
 create mode 100644 qa/suites/krbd/thrash/ms_mode$/crc-rxbounce.yaml
 create mode 100644 qa/suites/krbd/thrash/ms_mode$/legacy-rxbounce.yaml
 delete mode 100644 qa/suites/krbd/thrash/ms_mode$/prefer-crc.yaml

diff --git a/qa/suites/krbd/basic/ms_mode/crc$/.qa b/qa/suites/krbd/basic/ms_mode/crc$/.qa
new file mode 120000
index 00000000000..a602a0353e7
--- /dev/null
+++ b/qa/suites/krbd/basic/ms_mode/crc$/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file
diff --git a/qa/suites/krbd/basic/ms_mode/crc$/crc-rxbounce.yaml b/qa/suites/krbd/basic/ms_mode/crc$/crc-rxbounce.yaml
new file mode 100644
index 00000000000..4d27d01133c
--- /dev/null
+++ b/qa/suites/krbd/basic/ms_mode/crc$/crc-rxbounce.yaml
@@ -0,0 +1,5 @@
+overrides:
+  ceph:
+    conf:
+      client:
+        rbd default map options: ms_mode=crc,rxbounce
diff --git a/qa/suites/krbd/basic/ms_mode/crc.yaml b/qa/suites/krbd/basic/ms_mode/crc$/crc.yaml
similarity index 100%
rename from qa/suites/krbd/basic/ms_mode/crc.yaml
rename to qa/suites/krbd/basic/ms_mode/crc$/crc.yaml
diff --git a/qa/suites/krbd/basic/ms_mode/legacy$/.qa b/qa/suites/krbd/basic/ms_mode/legacy$/.qa
new file mode 120000
index 00000000000..a602a0353e7
--- /dev/null
+++ b/qa/suites/krbd/basic/ms_mode/legacy$/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file
diff --git a/qa/suites/krbd/basic/ms_mode/legacy$/legacy-rxbounce.yaml b/qa/suites/krbd/basic/ms_mode/legacy$/legacy-rxbounce.yaml
new file mode 100644
index 00000000000..244e45cbc76
--- /dev/null
+++ b/qa/suites/krbd/basic/ms_mode/legacy$/legacy-rxbounce.yaml
@@ -0,0 +1,5 @@
+overrides:
+  ceph:
+    conf:
+      client:
+        rbd default map options: ms_mode=legacy,rxbounce
diff --git a/qa/suites/krbd/basic/ms_mode/legacy.yaml b/qa/suites/krbd/basic/ms_mode/legacy$/legacy.yaml
similarity index 100%
rename from qa/suites/krbd/basic/ms_mode/legacy.yaml
rename to qa/suites/krbd/basic/ms_mode/legacy$/legacy.yaml
diff --git a/qa/suites/krbd/fsx/ms_mode$/crc-rxbounce.yaml b/qa/suites/krbd/fsx/ms_mode$/crc-rxbounce.yaml
new file mode 100644
index 00000000000..fb9c3dec238
--- /dev/null
+++ b/qa/suites/krbd/fsx/ms_mode$/crc-rxbounce.yaml
@@ -0,0 +1,5 @@
+overrides:
+  ceph:
+    conf:
+      client:
+        rbd default map options: ms_mode=crc,rxbounce,read_from_replica=balance
diff --git a/qa/suites/krbd/fsx/ms_mode$/legacy-rxbounce.yaml b/qa/suites/krbd/fsx/ms_mode$/legacy-rxbounce.yaml
new file mode 100644
index 00000000000..3306c1e57f0
--- /dev/null
+++ b/qa/suites/krbd/fsx/ms_mode$/legacy-rxbounce.yaml
@@ -0,0 +1,5 @@
+overrides:
+  ceph:
+    conf:
+      client:
+        rbd default map options: ms_mode=legacy,rxbounce,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
deleted file mode 100644
index a346c754892..00000000000
--- a/qa/suites/krbd/fsx/ms_mode$/prefer-crc.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-overrides:
-  ceph:
-    conf:
-      client:
-        rbd default map options: ms_mode=prefer-crc,read_from_replica=balance
diff --git a/qa/suites/krbd/rbd-nomount/ms_mode/crc$/.qa b/qa/suites/krbd/rbd-nomount/ms_mode/crc$/.qa
new file mode 120000
index 00000000000..a602a0353e7
--- /dev/null
+++ b/qa/suites/krbd/rbd-nomount/ms_mode/crc$/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file
diff --git a/qa/suites/krbd/rbd-nomount/ms_mode/crc$/crc-rxbounce.yaml b/qa/suites/krbd/rbd-nomount/ms_mode/crc$/crc-rxbounce.yaml
new file mode 100644
index 00000000000..4d27d01133c
--- /dev/null
+++ b/qa/suites/krbd/rbd-nomount/ms_mode/crc$/crc-rxbounce.yaml
@@ -0,0 +1,5 @@
+overrides:
+  ceph:
+    conf:
+      client:
+        rbd default map options: ms_mode=crc,rxbounce
diff --git a/qa/suites/krbd/rbd-nomount/ms_mode/crc.yaml b/qa/suites/krbd/rbd-nomount/ms_mode/crc$/crc.yaml
similarity index 100%
rename from qa/suites/krbd/rbd-nomount/ms_mode/crc.yaml
rename to qa/suites/krbd/rbd-nomount/ms_mode/crc$/crc.yaml
diff --git a/qa/suites/krbd/rbd-nomount/ms_mode/legacy$/.qa b/qa/suites/krbd/rbd-nomount/ms_mode/legacy$/.qa
new file mode 120000
index 00000000000..a602a0353e7
--- /dev/null
+++ b/qa/suites/krbd/rbd-nomount/ms_mode/legacy$/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file
diff --git a/qa/suites/krbd/rbd-nomount/ms_mode/legacy$/legacy-rxbounce.yaml b/qa/suites/krbd/rbd-nomount/ms_mode/legacy$/legacy-rxbounce.yaml
new file mode 100644
index 00000000000..244e45cbc76
--- /dev/null
+++ b/qa/suites/krbd/rbd-nomount/ms_mode/legacy$/legacy-rxbounce.yaml
@@ -0,0 +1,5 @@
+overrides:
+  ceph:
+    conf:
+      client:
+        rbd default map options: ms_mode=legacy,rxbounce
diff --git a/qa/suites/krbd/rbd-nomount/ms_mode/legacy.yaml b/qa/suites/krbd/rbd-nomount/ms_mode/legacy$/legacy.yaml
similarity index 100%
rename from qa/suites/krbd/rbd-nomount/ms_mode/legacy.yaml
rename to qa/suites/krbd/rbd-nomount/ms_mode/legacy$/legacy.yaml
diff --git a/qa/suites/krbd/rbd/ms_mode/crc$/.qa b/qa/suites/krbd/rbd/ms_mode/crc$/.qa
new file mode 120000
index 00000000000..a602a0353e7
--- /dev/null
+++ b/qa/suites/krbd/rbd/ms_mode/crc$/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file
diff --git a/qa/suites/krbd/rbd/ms_mode/crc$/crc-rxbounce.yaml b/qa/suites/krbd/rbd/ms_mode/crc$/crc-rxbounce.yaml
new file mode 100644
index 00000000000..4d27d01133c
--- /dev/null
+++ b/qa/suites/krbd/rbd/ms_mode/crc$/crc-rxbounce.yaml
@@ -0,0 +1,5 @@
+overrides:
+  ceph:
+    conf:
+      client:
+        rbd default map options: ms_mode=crc,rxbounce
diff --git a/qa/suites/krbd/rbd/ms_mode/crc.yaml b/qa/suites/krbd/rbd/ms_mode/crc$/crc.yaml
similarity index 100%
rename from qa/suites/krbd/rbd/ms_mode/crc.yaml
rename to qa/suites/krbd/rbd/ms_mode/crc$/crc.yaml
diff --git a/qa/suites/krbd/rbd/ms_mode/legacy$/.qa b/qa/suites/krbd/rbd/ms_mode/legacy$/.qa
new file mode 120000
index 00000000000..a602a0353e7
--- /dev/null
+++ b/qa/suites/krbd/rbd/ms_mode/legacy$/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file
diff --git a/qa/suites/krbd/rbd/ms_mode/legacy$/legacy-rxbounce.yaml b/qa/suites/krbd/rbd/ms_mode/legacy$/legacy-rxbounce.yaml
new file mode 100644
index 00000000000..244e45cbc76
--- /dev/null
+++ b/qa/suites/krbd/rbd/ms_mode/legacy$/legacy-rxbounce.yaml
@@ -0,0 +1,5 @@
+overrides:
+  ceph:
+    conf:
+      client:
+        rbd default map options: ms_mode=legacy,rxbounce
diff --git a/qa/suites/krbd/rbd/ms_mode/legacy.yaml b/qa/suites/krbd/rbd/ms_mode/legacy$/legacy.yaml
similarity index 100%
rename from qa/suites/krbd/rbd/ms_mode/legacy.yaml
rename to qa/suites/krbd/rbd/ms_mode/legacy$/legacy.yaml
diff --git a/qa/suites/krbd/singleton/ms_mode$/crc-rxbounce.yaml b/qa/suites/krbd/singleton/ms_mode$/crc-rxbounce.yaml
new file mode 100644
index 00000000000..4d27d01133c
--- /dev/null
+++ b/qa/suites/krbd/singleton/ms_mode$/crc-rxbounce.yaml
@@ -0,0 +1,5 @@
+overrides:
+  ceph:
+    conf:
+      client:
+        rbd default map options: ms_mode=crc,rxbounce
diff --git a/qa/suites/krbd/singleton/ms_mode$/legacy-rxbounce.yaml b/qa/suites/krbd/singleton/ms_mode$/legacy-rxbounce.yaml
new file mode 100644
index 00000000000..244e45cbc76
--- /dev/null
+++ b/qa/suites/krbd/singleton/ms_mode$/legacy-rxbounce.yaml
@@ -0,0 +1,5 @@
+overrides:
+  ceph:
+    conf:
+      client:
+        rbd default map options: ms_mode=legacy,rxbounce
diff --git a/qa/suites/krbd/singleton/ms_mode$/prefer-crc.yaml b/qa/suites/krbd/singleton/ms_mode$/prefer-crc.yaml
deleted file mode 100644
index 1054473af18..00000000000
--- a/qa/suites/krbd/singleton/ms_mode$/prefer-crc.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-overrides:
-  ceph:
-    conf:
-      client:
-        rbd default map options: ms_mode=prefer-crc
diff --git a/qa/suites/krbd/thrash/ms_mode$/crc-rxbounce.yaml b/qa/suites/krbd/thrash/ms_mode$/crc-rxbounce.yaml
new file mode 100644
index 00000000000..4d27d01133c
--- /dev/null
+++ b/qa/suites/krbd/thrash/ms_mode$/crc-rxbounce.yaml
@@ -0,0 +1,5 @@
+overrides:
+  ceph:
+    conf:
+      client:
+        rbd default map options: ms_mode=crc,rxbounce
diff --git a/qa/suites/krbd/thrash/ms_mode$/legacy-rxbounce.yaml b/qa/suites/krbd/thrash/ms_mode$/legacy-rxbounce.yaml
new file mode 100644
index 00000000000..244e45cbc76
--- /dev/null
+++ b/qa/suites/krbd/thrash/ms_mode$/legacy-rxbounce.yaml
@@ -0,0 +1,5 @@
+overrides:
+  ceph:
+    conf:
+      client:
+        rbd default map options: ms_mode=legacy,rxbounce
diff --git a/qa/suites/krbd/thrash/ms_mode$/prefer-crc.yaml b/qa/suites/krbd/thrash/ms_mode$/prefer-crc.yaml
deleted file mode 100644
index 1054473af18..00000000000
--- a/qa/suites/krbd/thrash/ms_mode$/prefer-crc.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-overrides:
-  ceph:
-    conf:
-      client:
-        rbd default map options: ms_mode=prefer-crc