From: Ilya Dryomov Date: Wed, 20 Jan 2021 15:00:18 +0000 (+0100) Subject: qa/suites/krbd: add msgr2 modes to most subsuites X-Git-Tag: v16.2.0~241^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=44be5232a99d86261c21f99468f9412dd906c98c;p=ceph.git 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 (cherry picked from commit 65948736a41f424d8152b208d013419f8d6038a4) --- diff --git a/qa/suites/krbd/basic/ms_mode/.qa b/qa/suites/krbd/basic/ms_mode/.qa new file mode 120000 index 000000000000..a602a0353e75 --- /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 000000000000..3b072578f1fd --- /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 000000000000..0048dcb0cec2 --- /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 000000000000..a735db18d2c3 --- /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 d4863aa51be0..30da870b25df 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 000000000000..a602a0353e75 --- /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 000000000000..d11be38876a0 --- /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 000000000000..2b7116c03483 --- /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 000000000000..a346c7548920 --- /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 000000000000..671b73f9c6bc --- /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 000000000000..a602a0353e75 --- /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 000000000000..3b072578f1fd --- /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 000000000000..0048dcb0cec2 --- /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 000000000000..a735db18d2c3 --- /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 000000000000..a602a0353e75 --- /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 000000000000..3b072578f1fd --- /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 000000000000..0048dcb0cec2 --- /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 000000000000..a735db18d2c3 --- /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 000000000000..a602a0353e75 --- /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 000000000000..3b072578f1fd --- /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 000000000000..0048dcb0cec2 --- /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 000000000000..1054473af186 --- /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 000000000000..a735db18d2c3 --- /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 000000000000..a602a0353e75 --- /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 000000000000..3b072578f1fd --- /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 000000000000..0048dcb0cec2 --- /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 000000000000..1054473af186 --- /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 000000000000..a735db18d2c3 --- /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