mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2024-12-19 03:20:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

rbd: added RBD features support for krbd

Browse Source 
Added support for `object-map, fast-diff`

Signed-off-by: Konstantin Shalygin <k0ste@k0ste.ru>
This commit is contained in:
Konstantin Shalygin 2021-09-16 13:38:04 +03:00 committed by mergify[bot]
parent 64ce5e0949
commit 7411773f73
5 changed files with 48 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
charts/ceph-csi-rbd/values.yaml
View File

@ -284,10 +284,11 @@ storageClass:
thickProvision: false thickProvision: false
# (required) RBD image features, CSI creates image with image-format 2 # (required) RBD image features, CSI creates image with image-format 2
# CSI RBD currently supports `layering`, `journaling`, `exclusive-lock` # CSI RBD currently supports `layering`, `journaling`, `exclusive-lock`,
# features. If `journaling` is enabled, must enable `exclusive-lock` too. # `object-map`, `fast-diff` features. If `journaling` is enabled, must
# imageFeatures: layering,journaling,exclusive-lock # enable `exclusive-lock` too.
imageFeatures: layering # imageFeatures: layering,journaling,exclusive-lock,object-map,fast-diff
imageFeatures: "layering"
# (optional) Specifies whether to try other mounters in case if the current # (optional) Specifies whether to try other mounters in case if the current
# mounter fails to mount the rbd image for any reason. True means fallback # mounter fails to mount the rbd image for any reason. True means fallback

2
docs/deploy-rbd.md
View File

@ -55,7 +55,7 @@ make image-cephcsi
| `dataPool` | no | Ceph pool used for the data of the RBD images. | | `dataPool` | no | Ceph pool used for the data of the RBD images. |
| `volumeNamePrefix` | no | Prefix to use for naming RBD images (defaults to `csi-vol-`). | | `volumeNamePrefix` | no | Prefix to use for naming RBD images (defaults to `csi-vol-`). |
| `snapshotNamePrefix` | no | Prefix to use for naming RBD snapshot images (defaults to `csi-snap-`). | | `snapshotNamePrefix` | no | Prefix to use for naming RBD snapshot images (defaults to `csi-snap-`). |
| `imageFeatures` | yes | RBD image features. CSI RBD currently supports `layering`, `journaling`, `exclusive-lock` features. If `journaling` is enabled, must enable `exclusive-lock` too. See [man pages](http://docs.ceph.com/docs/master/man/8/rbd/#cmdoption-rbd-image-feature) Note that the required support for [object-map and fast-diff were added in 5.3 and journaling does not have KRBD support yet](https://docs.ceph.com/en/latest/rbd/rbd-config-ref/#image-features). deep-flatten is added for cloned images. | | `imageFeatures` | yes | RBD image features. CSI RBD currently supports `layering`, `journaling`, `exclusive-lock`, `object-map`, `fast-diff` features. If `journaling` is enabled, must enable `exclusive-lock` too. See [man pages](http://docs.ceph.com/docs/master/man/8/rbd/#cmdoption-rbd-image-feature) Note that the required support for [object-map and fast-diff were added in 5.3 and journaling does not have KRBD support yet](https://docs.ceph.com/en/latest/rbd/rbd-config-ref/#image-features). deep-flatten is added for cloned images. |
| `tryOtherMounters` | no | Specifies whether to try other mounters in case if the current mounter fails to mount the rbd image for any reason | | `tryOtherMounters` | no | Specifies whether to try other mounters in case if the current mounter fails to mount the rbd image for any reason |
| `mapOptions` | no | Map options to use when mapping rbd image. See [krbd](https://docs.ceph.com/docs/master/man/8/rbd/#kernel-rbd-krbd-options) and [nbd](https://docs.ceph.com/docs/master/man/8/rbd-nbd/#options) options. | | `mapOptions` | no | Map options to use when mapping rbd image. See [krbd](https://docs.ceph.com/docs/master/man/8/rbd/#kernel-rbd-krbd-options) and [nbd](https://docs.ceph.com/docs/master/man/8/rbd-nbd/#options) options. |
| `unmapOptions` | no | Unmap options to use when unmapping rbd image. See [krbd](https://docs.ceph.com/docs/master/man/8/rbd/#kernel-rbd-krbd-options) and [nbd](https://docs.ceph.com/docs/master/man/8/rbd-nbd/#options) options. | | `unmapOptions` | no | Unmap options to use when unmapping rbd image. See [krbd](https://docs.ceph.com/docs/master/man/8/rbd/#kernel-rbd-krbd-options) and [nbd](https://docs.ceph.com/docs/master/man/8/rbd-nbd/#options) options. |

9
examples/rbd/storageclass.yaml
View File

@ -34,10 +34,11 @@ parameters:
# thickProvision: "false" # thickProvision: "false"
# (required) RBD image features, CSI creates image with image-format 2 # (required) RBD image features, CSI creates image with image-format 2
# CSI RBD currently supports `layering`, `journaling`, `exclusive-lock` # CSI RBD currently supports `layering`, `journaling`, `exclusive-lock`,
# features. If `journaling` is enabled, must enable `exclusive-lock` too. # `object-map`, `fast-diff` features. If `journaling` is enabled, must
# imageFeatures: layering,journaling,exclusive-lock # enable `exclusive-lock` too.
imageFeatures: layering # imageFeatures: layering,journaling,exclusive-lock,object-map,fast-diff
imageFeatures: "layering"
# (optional) Specifies whether to try other mounters in case if the current # (optional) Specifies whether to try other mounters in case if the current
# mounter fails to mount the rbd image for any reason. True means fallback # mounter fails to mount the rbd image for any reason. True means fallback

10
internal/rbd/rbd_util.go
View File

@ -206,7 +206,15 @@ var (
needRbdNbd: false, needRbdNbd: false,
}, },
librbd.FeatureNameExclusiveLock: { librbd.FeatureNameExclusiveLock: {
needRbdNbd: true, needRbdNbd: false,
},
librbd.FeatureNameObjectMap: {
needRbdNbd: false,
dependsOn: []string{librbd.FeatureNameExclusiveLock},
},
librbd.FeatureNameFastDiff: {
needRbdNbd: false,
dependsOn: []string{librbd.FeatureNameObjectMap},
}, },
librbd.FeatureNameJournaling: { librbd.FeatureNameJournaling: {
needRbdNbd: true, needRbdNbd: true,

32
internal/rbd/rbd_util_test.go
View File

@ -88,21 +88,37 @@ func TestValidateImageFeatures(t *testing.T) {
false, false,
"", "",
}, },
{
"layering,exclusive-lock,object-map,fast-diff",
&rbdVolume{
Mounter: rbdDefaultMounter,
},
false,
"",
},
{ {
"layering,journaling", "layering,journaling",
&rbdVolume{ &rbdVolume{
Mounter: rbdNbdMounter, Mounter: rbdDefaultMounter,
}, },
true, true,
"feature journaling requires exclusive-lock to be set", "feature journaling requires exclusive-lock to be set",
}, },
{ {
"layering,exclusive-lock,journaling", "object-map,fast-diff",
&rbdVolume{ &rbdVolume{
Mounter: rbdDefaultMounter, Mounter: rbdDefaultMounter,
}, },
true, true,
"feature exclusive-lock requires rbd-nbd for mounter", "feature object-map requires exclusive-lock to be set",
},
{
"fast-diff",
&rbdVolume{
Mounter: rbdDefaultMounter,
},
true,
"feature fast-diff requires object-map to be set",
}, },
{ {
"layering,exclusive-lock,journaling", "layering,exclusive-lock,journaling",
@ -110,7 +126,15 @@ func TestValidateImageFeatures(t *testing.T) {
Mounter: rbdDefaultMounter, Mounter: rbdDefaultMounter,
}, },
true, true,
"feature exclusive-lock requires rbd-nbd for mounter", "feature journaling requires rbd-nbd for mounter",
},
{
"layering,exclusive-lock,journaling",
&rbdVolume{
Mounter: rbdDefaultMounter,
},
true,
"feature journaling requires rbd-nbd for mounter",
}, },
{ {
"layering,exclusive-loc,journaling", "layering,exclusive-loc,journaling",