Skip to content

Commit fbdf927

Browse files
authored
Merge pull request ceph#64711 from idryomov/wip-72134-cont
qa/suites/krbd: request msgr1 explicitly in unmap subsuite Reviewed-by: Miki Patel <[email protected]>
2 parents be9b0e3 + 9edb212 commit fbdf927

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

doc/man/8/rbd.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -895,7 +895,7 @@ Per mapping (block device) `rbd device map` options:
895895
backend that the data is incompressible, disabling compression in aggressive
896896
mode (since 5.8).
897897

898-
* ms_mode=legacy - Use msgr1 on-the-wire protocol (since 5.11, default).
898+
* ms_mode=legacy - Use msgr1 on-the-wire protocol (since 5.11).
899899

900900
* ms_mode=crc - Use msgr2.1 on-the-wire protocol, select 'crc' mode, also
901901
referred to as plain mode (since 5.11). If the daemon denies 'crc' mode,
@@ -907,8 +907,8 @@ Per mapping (block device) `rbd device map` options:
907907
fail the connection.
908908

909909
* ms_mode=prefer-crc - Use msgr2.1 on-the-wire protocol, select 'crc'
910-
mode (since 5.11). If the daemon denies 'crc' mode in favor of 'secure'
911-
mode, agree to 'secure' mode.
910+
mode (since 5.11, default). If the daemon denies 'crc' mode in favor of
911+
'secure' mode, agree to 'secure' mode.
912912

913913
* ms_mode=prefer-secure - Use msgr2.1 on-the-wire protocol, select 'secure'
914914
mode (since 5.11). If the daemon denies 'secure' mode in favor of 'crc'

qa/suites/krbd/unmap/ceph/ceph.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ overrides:
88
cephx require version: 1
99
cephx service require version: 1
1010
ms bind msgr2: false
11+
client:
12+
rbd default map options: ms_mode=legacy
1113
tasks:
1214
- install:
1315
- ceph:

0 commit comments

Comments
 (0)