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

cleanup: move static volume check to helper function

Browse Source 
Signed-off-by: Prasanna Kumar Kalever <prasanna.kalever@redhat.com>
This commit is contained in:
Prasanna Kumar Kalever 2021-06-03 17:10:16 +05:30 committed by mergify[bot]
parent 10e4eee481
commit 6007fc9bfe
1 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
internal/rbd/nodeserver.go
View File

@ -96,6 +96,20 @@ var (
xfsHasReflink = xfsReflinkUnset xfsHasReflink = xfsReflinkUnset
) )
// isStaticVolume checks if the volume is static.
func isStaticVolume(parameters map[string]string) bool {
var err error
staticVol := false
val, ok := parameters["staticVolume"]
if ok {
if staticVol, err = strconv.ParseBool(val); err != nil {
return false
}
}
return staticVol
}
// NodeStageVolume mounts the volume to a staging path on the node. // NodeStageVolume mounts the volume to a staging path on the node.
// Implementation notes: // Implementation notes:
// - stagingTargetPath is the directory passed in the request where the volume needs to be staged // - stagingTargetPath is the directory passed in the request where the volume needs to be staged
@ -154,15 +168,6 @@ func (ns *NodeServer) NodeStageVolume(
stagingParentPath := req.GetStagingTargetPath() stagingParentPath := req.GetStagingTargetPath()
stagingTargetPath := stagingParentPath + "/" + volID stagingTargetPath := stagingParentPath + "/" + volID
// check is it a static volume
staticVol := false
val, ok := req.GetVolumeContext()["staticVolume"]
if ok {
if staticVol, err = strconv.ParseBool(val); err != nil {
return nil, status.Error(codes.InvalidArgument, err.Error())
}
}
// check if stagingPath is already mounted // check if stagingPath is already mounted
isNotMnt, err := isNotMountPoint(ns.mounter, stagingTargetPath) isNotMnt, err := isNotMountPoint(ns.mounter, stagingTargetPath)
if err != nil { if err != nil {
@ -172,9 +177,11 @@ func (ns *NodeServer) NodeStageVolume(
return &csi.NodeStageVolumeResponse{}, nil return &csi.NodeStageVolumeResponse{}, nil
} }
isStaticVol := isStaticVolume(req.GetVolumeContext())
// throw error when imageFeatures parameter is missing or empty // throw error when imageFeatures parameter is missing or empty
// for backward compatibility, ignore error for non-static volumes from older cephcsi version // for backward compatibility, ignore error for non-static volumes from older cephcsi version
if imageFeatures, ok := req.GetVolumeContext()["imageFeatures"]; checkImageFeatures(imageFeatures, ok, staticVol) { if imageFeatures, ok := req.GetVolumeContext()["imageFeatures"]; checkImageFeatures(imageFeatures, ok, isStaticVol) {
return nil, status.Error(codes.InvalidArgument, "missing required parameter imageFeatures") return nil, status.Error(codes.InvalidArgument, "missing required parameter imageFeatures")
} }
@ -187,10 +194,9 @@ func (ns *NodeServer) NodeStageVolume(
// get rbd image name from the volume journal // get rbd image name from the volume journal
// for static volumes, the image name is actually the volume ID itself // for static volumes, the image name is actually the volume ID itself
switch { if isStaticVol {
case staticVol:
volOptions.RbdImageName = volID volOptions.RbdImageName = volID
default: } else {
var vi util.CSIIdentifier var vi util.CSIIdentifier
var imageAttributes *journal.ImageAttributes var imageAttributes *journal.ImageAttributes
err = vi.DecomposeCSIID(volID) err = vi.DecomposeCSIID(volID)
@ -236,7 +242,7 @@ func (ns *NodeServer) NodeStageVolume(
// perform the actual staging and if this fails, have undoStagingTransaction // perform the actual staging and if this fails, have undoStagingTransaction
// cleans up for us // cleans up for us
transaction, err = ns.stageTransaction(ctx, req, volOptions, staticVol) transaction, err = ns.stageTransaction(ctx, req, volOptions, isStaticVol)
if err != nil { if err != nil {
return nil, status.Error(codes.Internal, err.Error()) return nil, status.Error(codes.Internal, err.Error())
} }