mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2025-06-14 18:53:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleanup: generalize the parseBool function

Browse Source 
Signed-off-by: Prasanna Kumar Kalever <prasanna.kalever@redhat.com>
This commit is contained in:
Prasanna Kumar Kalever
2021-10-29 12:26:29 +05:30
committed by mergify[bot]
parent 84ec797dda
commit bfc24f6f12
2 changed files with 65 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
internal/rbd/nodeserver.go
View File

@ -67,6 +67,9 @@ const (
xfsReflinkUnset int = iota
xfsReflinkNoSupport
xfsReflinkSupport
staticVol = "staticVolume"
volHealerCtx = "volumeHealerContext"
)
var (
@ -98,34 +101,20 @@ var (
xfsHasReflink = xfsReflinkUnset
)
// isHealerContext checks if the request is been made from volumeHealer.
func isHealerContext(parameters map[string]string) bool {
var err error
healerContext := false
// parseBoolOption checks if parameters contain option and parse it. If it is
// empty or not set return default.
// nolint:unparam // currently defValue is always false, this can change in the future
func parseBoolOption(ctx context.Context, parameters map[string]string, optionName string, defValue bool) bool {
boolVal := defValue
val, ok := parameters["volumeHealerContext"]
if ok {
if healerContext, err = strconv.ParseBool(val); err != nil {
return false
if val, ok := parameters[optionName]; ok {
var err error
if boolVal, err = strconv.ParseBool(val); err != nil {
log.ErrorLog(ctx, "failed to parse value of %q: %q", optionName, val)
}
}
return healerContext
}
// 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
return boolVal
}
// healerStageTransaction attempts to attach the rbd Image with previously
@ -189,7 +178,7 @@ func populateRbdVol(
}
rv.ThickProvision = isThickProvisionRequest(req.GetVolumeContext())
isStaticVol := isStaticVolume(req.GetVolumeContext())
isStaticVol := parseBoolOption(ctx, req.GetVolumeContext(), staticVol, false)
// get rbd image name from the volume journal
// for static volumes, the image name is actually the volume ID itself
if isStaticVol {
@ -299,7 +288,7 @@ func (ns *NodeServer) NodeStageVolume(
stagingParentPath := req.GetStagingTargetPath()
stagingTargetPath := stagingParentPath + "/" + volID
isHealer := isHealerContext(req.GetVolumeContext())
isHealer := parseBoolOption(ctx, req.GetVolumeContext(), volHealerCtx, false)
if !isHealer {
var isNotMnt bool
// check if stagingPath is already mounted
@ -313,7 +302,7 @@ func (ns *NodeServer) NodeStageVolume(
}
}
isStaticVol := isStaticVolume(req.GetVolumeContext())
isStaticVol := parseBoolOption(ctx, req.GetVolumeContext(), staticVol, false)
// throw error when imageFeatures parameter is missing or empty
// for backward compatibility, ignore error for non-static volumes from older cephcsi version