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

rbd: make hasSnapshotFeature() a method of rbdVolume

Browse Source 
Signed-off-by: Niels de Vos <ndevos@redhat.com>
This commit is contained in:
Niels de Vos 2020-06-18 13:33:06 +02:00 committed by mergify[bot]
parent dcbf71dd5d
commit decfc1ae2c
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/rbd/controllerserver.go
View File

@ -532,7 +532,7 @@ func (cs *ControllerServer) CreateSnapshot(ctx context.Context, req *csi.CreateS
} }
// Check if source volume was created with required image features for snaps // Check if source volume was created with required image features for snaps
if !hasSnapshotFeature(rbdVol.ImageFeatures) { if !rbdVol.hasSnapshotFeature() {
return nil, status.Errorf(codes.InvalidArgument, "volume(%s) has not snapshot feature(layering)", req.GetSourceVolumeId()) return nil, status.Errorf(codes.InvalidArgument, "volume(%s) has not snapshot feature(layering)", req.GetSourceVolumeId())
} }

4
internal/rbd/rbd_util.go
View File

@ -691,8 +691,8 @@ func genSnapFromOptions(ctx context.Context, rbdVol *rbdVolume, snapOptions map[
return rbdSnap return rbdSnap
} }
func hasSnapshotFeature(imageFeatures string) bool { func (rv *rbdVolume) hasSnapshotFeature() bool {
arr := strings.Split(imageFeatures, ",") arr := strings.Split(rv.ImageFeatures, ",")
for _, f := range arr { for _, f := range arr {
if f == "layering" { if f == "layering" {
return true return true