From: Ilya Dryomov <idryomov@gmail.com>
Date: Thu, 28 Sep 2023 09:52:06 +0000 (+0200)
Subject: qa/suites/krbd: rename singleton to singleton-msgr-failures
X-Git-Tag: v16.2.15~170^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c92c001c0033c7eb94865424ce48a30cd98788d8;p=ceph.git

qa/suites/krbd: rename singleton to singleton-msgr-failures

A "singleton without msgr-failures" is wanted in the next commit.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit 2094a0450d071ed5fc430a5cdfa524a69098fbd4)
---

diff --git a/qa/suites/krbd/singleton-msgr-failures/% b/qa/suites/krbd/singleton-msgr-failures/%
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/qa/suites/krbd/singleton-msgr-failures/.qa b/qa/suites/krbd/singleton-msgr-failures/.qa
new file mode 120000
index 000000000000..a602a0353e75
--- /dev/null
+++ b/qa/suites/krbd/singleton-msgr-failures/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file
diff --git a/qa/suites/krbd/singleton-msgr-failures/bluestore-bitmap.yaml b/qa/suites/krbd/singleton-msgr-failures/bluestore-bitmap.yaml
new file mode 120000
index 000000000000..a59cf5175069
--- /dev/null
+++ b/qa/suites/krbd/singleton-msgr-failures/bluestore-bitmap.yaml
@@ -0,0 +1 @@
+.qa/objectstore/bluestore-bitmap.yaml
\ No newline at end of file
diff --git a/qa/suites/krbd/singleton-msgr-failures/conf.yaml b/qa/suites/krbd/singleton-msgr-failures/conf.yaml
new file mode 100644
index 000000000000..5e7ed992e904
--- /dev/null
+++ b/qa/suites/krbd/singleton-msgr-failures/conf.yaml
@@ -0,0 +1,7 @@
+overrides:
+  ceph:
+    conf:
+      global:
+        ms die on skipped message: false
+      client:
+        rbd default features: 37
diff --git a/qa/suites/krbd/singleton-msgr-failures/ms_mode$/.qa b/qa/suites/krbd/singleton-msgr-failures/ms_mode$/.qa
new file mode 120000
index 000000000000..a602a0353e75
--- /dev/null
+++ b/qa/suites/krbd/singleton-msgr-failures/ms_mode$/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file
diff --git a/qa/suites/krbd/singleton-msgr-failures/ms_mode$/crc-rxbounce.yaml b/qa/suites/krbd/singleton-msgr-failures/ms_mode$/crc-rxbounce.yaml
new file mode 100644
index 000000000000..4d27d01133cd
--- /dev/null
+++ b/qa/suites/krbd/singleton-msgr-failures/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-msgr-failures/ms_mode$/crc.yaml b/qa/suites/krbd/singleton-msgr-failures/ms_mode$/crc.yaml
new file mode 100644
index 000000000000..3b072578f1fd
--- /dev/null
+++ b/qa/suites/krbd/singleton-msgr-failures/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-msgr-failures/ms_mode$/legacy-rxbounce.yaml b/qa/suites/krbd/singleton-msgr-failures/ms_mode$/legacy-rxbounce.yaml
new file mode 100644
index 000000000000..244e45cbc764
--- /dev/null
+++ b/qa/suites/krbd/singleton-msgr-failures/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-msgr-failures/ms_mode$/legacy.yaml b/qa/suites/krbd/singleton-msgr-failures/ms_mode$/legacy.yaml
new file mode 100644
index 000000000000..0048dcb0cec2
--- /dev/null
+++ b/qa/suites/krbd/singleton-msgr-failures/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-msgr-failures/ms_mode$/secure.yaml b/qa/suites/krbd/singleton-msgr-failures/ms_mode$/secure.yaml
new file mode 100644
index 000000000000..a735db18d2c3
--- /dev/null
+++ b/qa/suites/krbd/singleton-msgr-failures/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-msgr-failures/msgr-failures/.qa b/qa/suites/krbd/singleton-msgr-failures/msgr-failures/.qa
new file mode 120000
index 000000000000..a602a0353e75
--- /dev/null
+++ b/qa/suites/krbd/singleton-msgr-failures/msgr-failures/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file
diff --git a/qa/suites/krbd/singleton-msgr-failures/msgr-failures/few.yaml b/qa/suites/krbd/singleton-msgr-failures/msgr-failures/few.yaml
new file mode 100644
index 000000000000..519288992fea
--- /dev/null
+++ b/qa/suites/krbd/singleton-msgr-failures/msgr-failures/few.yaml
@@ -0,0 +1,8 @@
+overrides:
+  ceph:
+    conf:
+      global:
+        ms inject socket failures: 5000
+        mon client directed command retry: 5
+    log-ignorelist:
+      - \(OSD_SLOW_PING_TIME
diff --git a/qa/suites/krbd/singleton-msgr-failures/msgr-failures/many.yaml b/qa/suites/krbd/singleton-msgr-failures/msgr-failures/many.yaml
new file mode 100644
index 000000000000..e3855297d760
--- /dev/null
+++ b/qa/suites/krbd/singleton-msgr-failures/msgr-failures/many.yaml
@@ -0,0 +1,8 @@
+overrides:
+  ceph:
+    conf:
+      global:
+        ms inject socket failures: 500
+        mon client directed command retry: 5
+    log-ignorelist:
+      - \(OSD_SLOW_PING_TIME
diff --git a/qa/suites/krbd/singleton-msgr-failures/tasks/.qa b/qa/suites/krbd/singleton-msgr-failures/tasks/.qa
new file mode 120000
index 000000000000..a602a0353e75
--- /dev/null
+++ b/qa/suites/krbd/singleton-msgr-failures/tasks/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file
diff --git a/qa/suites/krbd/singleton-msgr-failures/tasks/rbd_xfstests.yaml b/qa/suites/krbd/singleton-msgr-failures/tasks/rbd_xfstests.yaml
new file mode 100644
index 000000000000..c94af0207147
--- /dev/null
+++ b/qa/suites/krbd/singleton-msgr-failures/tasks/rbd_xfstests.yaml
@@ -0,0 +1,38 @@
+roles:
+- [mon.a, mon.c, osd.0, osd.1, osd.2]
+- [mon.b, mgr.x, mds.a, osd.3, osd.4, osd.5]
+- [client.0]
+- [client.1]
+openstack:
+- volumes: # attached to each instance
+    count: 3
+    size: 10 # GB
+tasks:
+- install:
+- ceph:
+- rbd.xfstests:
+    client.0: &ref
+        test_image: 'test_image-0'
+        test_size: 5120  # MB
+        scratch_image: 'scratch_image-0'
+        scratch_size: 15360  # MB
+        fs_type: ext4
+        tests: '-g auto -g blockdev -x clone'
+        exclude:
+        - generic/042
+        - generic/392
+        - generic/044
+        - generic/045
+        - generic/046
+        - generic/223
+        - ext4/002  # removed upstream
+        - ext4/304
+        - generic/388
+        - generic/405
+        - generic/422
+        - shared/298  # lockdep false positive
+        randomize: true
+    client.1:
+        <<: *ref
+        test_image: 'test_image-1'
+        scratch_image: 'scratch_image-1'
diff --git a/qa/suites/krbd/singleton/% b/qa/suites/krbd/singleton/%
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/qa/suites/krbd/singleton/.qa b/qa/suites/krbd/singleton/.qa
deleted file mode 120000
index a602a0353e75..000000000000
--- a/qa/suites/krbd/singleton/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.qa/
\ No newline at end of file
diff --git a/qa/suites/krbd/singleton/bluestore-bitmap.yaml b/qa/suites/krbd/singleton/bluestore-bitmap.yaml
deleted file mode 120000
index a59cf5175069..000000000000
--- a/qa/suites/krbd/singleton/bluestore-bitmap.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/objectstore/bluestore-bitmap.yaml
\ No newline at end of file
diff --git a/qa/suites/krbd/singleton/conf.yaml b/qa/suites/krbd/singleton/conf.yaml
deleted file mode 100644
index 5e7ed992e904..000000000000
--- a/qa/suites/krbd/singleton/conf.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-overrides:
-  ceph:
-    conf:
-      global:
-        ms die on skipped message: false
-      client:
-        rbd default features: 37
diff --git a/qa/suites/krbd/singleton/ms_mode$/.qa b/qa/suites/krbd/singleton/ms_mode$/.qa
deleted file mode 120000
index a602a0353e75..000000000000
--- a/qa/suites/krbd/singleton/ms_mode$/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.qa/
\ No newline at end of file
diff --git a/qa/suites/krbd/singleton/ms_mode$/crc-rxbounce.yaml b/qa/suites/krbd/singleton/ms_mode$/crc-rxbounce.yaml
deleted file mode 100644
index 4d27d01133cd..000000000000
--- a/qa/suites/krbd/singleton/ms_mode$/crc-rxbounce.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-overrides:
-  ceph:
-    conf:
-      client:
-        rbd default map options: ms_mode=crc,rxbounce
diff --git a/qa/suites/krbd/singleton/ms_mode$/crc.yaml b/qa/suites/krbd/singleton/ms_mode$/crc.yaml
deleted file mode 100644
index 3b072578f1fd..000000000000
--- a/qa/suites/krbd/singleton/ms_mode$/crc.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-overrides:
-  ceph:
-    conf:
-      client:
-        rbd default map options: ms_mode=crc
diff --git a/qa/suites/krbd/singleton/ms_mode$/legacy-rxbounce.yaml b/qa/suites/krbd/singleton/ms_mode$/legacy-rxbounce.yaml
deleted file mode 100644
index 244e45cbc764..000000000000
--- a/qa/suites/krbd/singleton/ms_mode$/legacy-rxbounce.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-overrides:
-  ceph:
-    conf:
-      client:
-        rbd default map options: ms_mode=legacy,rxbounce
diff --git a/qa/suites/krbd/singleton/ms_mode$/legacy.yaml b/qa/suites/krbd/singleton/ms_mode$/legacy.yaml
deleted file mode 100644
index 0048dcb0cec2..000000000000
--- a/qa/suites/krbd/singleton/ms_mode$/legacy.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-overrides:
-  ceph:
-    conf:
-      client:
-        rbd default map options: ms_mode=legacy
diff --git a/qa/suites/krbd/singleton/ms_mode$/secure.yaml b/qa/suites/krbd/singleton/ms_mode$/secure.yaml
deleted file mode 100644
index a735db18d2c3..000000000000
--- a/qa/suites/krbd/singleton/ms_mode$/secure.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-overrides:
-  ceph:
-    conf:
-      client:
-        rbd default map options: ms_mode=secure
diff --git a/qa/suites/krbd/singleton/msgr-failures/.qa b/qa/suites/krbd/singleton/msgr-failures/.qa
deleted file mode 120000
index a602a0353e75..000000000000
--- a/qa/suites/krbd/singleton/msgr-failures/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.qa/
\ No newline at end of file
diff --git a/qa/suites/krbd/singleton/msgr-failures/few.yaml b/qa/suites/krbd/singleton/msgr-failures/few.yaml
deleted file mode 100644
index 519288992fea..000000000000
--- a/qa/suites/krbd/singleton/msgr-failures/few.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-overrides:
-  ceph:
-    conf:
-      global:
-        ms inject socket failures: 5000
-        mon client directed command retry: 5
-    log-ignorelist:
-      - \(OSD_SLOW_PING_TIME
diff --git a/qa/suites/krbd/singleton/msgr-failures/many.yaml b/qa/suites/krbd/singleton/msgr-failures/many.yaml
deleted file mode 100644
index e3855297d760..000000000000
--- a/qa/suites/krbd/singleton/msgr-failures/many.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-overrides:
-  ceph:
-    conf:
-      global:
-        ms inject socket failures: 500
-        mon client directed command retry: 5
-    log-ignorelist:
-      - \(OSD_SLOW_PING_TIME
diff --git a/qa/suites/krbd/singleton/tasks/.qa b/qa/suites/krbd/singleton/tasks/.qa
deleted file mode 120000
index a602a0353e75..000000000000
--- a/qa/suites/krbd/singleton/tasks/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.qa/
\ No newline at end of file
diff --git a/qa/suites/krbd/singleton/tasks/rbd_xfstests.yaml b/qa/suites/krbd/singleton/tasks/rbd_xfstests.yaml
deleted file mode 100644
index c94af0207147..000000000000
--- a/qa/suites/krbd/singleton/tasks/rbd_xfstests.yaml
+++ /dev/null
@@ -1,38 +0,0 @@
-roles:
-- [mon.a, mon.c, osd.0, osd.1, osd.2]
-- [mon.b, mgr.x, mds.a, osd.3, osd.4, osd.5]
-- [client.0]
-- [client.1]
-openstack:
-- volumes: # attached to each instance
-    count: 3
-    size: 10 # GB
-tasks:
-- install:
-- ceph:
-- rbd.xfstests:
-    client.0: &ref
-        test_image: 'test_image-0'
-        test_size: 5120  # MB
-        scratch_image: 'scratch_image-0'
-        scratch_size: 15360  # MB
-        fs_type: ext4
-        tests: '-g auto -g blockdev -x clone'
-        exclude:
-        - generic/042
-        - generic/392
-        - generic/044
-        - generic/045
-        - generic/046
-        - generic/223
-        - ext4/002  # removed upstream
-        - ext4/304
-        - generic/388
-        - generic/405
-        - generic/422
-        - shared/298  # lockdep false positive
-        randomize: true
-    client.1:
-        <<: *ref
-        test_image: 'test_image-1'
-        scratch_image: 'scratch_image-1'