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

rbd: introduce appendDeviceTypeAndOptions()

Browse Source 
Factor out --device-type and --options formatting.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit c2493686b7)
This commit is contained in:
Ilya Dryomov 2020-08-21 19:00:06 +02:00 committed by mergify[bot]
parent 6918cbe950
commit ca59d53a60
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
internal/rbd/rbd_attach.go
View File

@ -208,6 +208,20 @@ func attachRBDImage(ctx context.Context, volOptions *rbdVolume, cr *util.Credent
return devicePath, err return devicePath, err
} }
func appendDeviceTypeAndOptions(cmdArgs []string, isNbd bool, userOptions string) []string {
accessType := accessTypeKRbd
if isNbd {
accessType = accessTypeNbd
}
cmdArgs = append(cmdArgs, "--device-type", accessType)
if userOptions != "" {
cmdArgs = append(cmdArgs, "--options", userOptions)
}
return cmdArgs
}
func createPath(ctx context.Context, volOpt *rbdVolume, cr *util.Credentials) (string, error) { func createPath(ctx context.Context, volOpt *rbdVolume, cr *util.Credentials) (string, error) {
isNbd := false isNbd := false
imagePath := volOpt.String() imagePath := volOpt.String()
@ -222,22 +236,15 @@ func createPath(ctx context.Context, volOpt *rbdVolume, cr *util.Credentials) (s
} }
// Choose access protocol // Choose access protocol
accessType := accessTypeKRbd
if volOpt.Mounter == rbdTonbd && hasNBD { if volOpt.Mounter == rbdTonbd && hasNBD {
isNbd = true isNbd = true
accessType = accessTypeNbd
} }
// Update options with device type selection mapArgs = appendDeviceTypeAndOptions(mapArgs, isNbd, volOpt.MapOptions)
mapArgs = append(mapArgs, "--device-type", accessType)
if volOpt.readOnly { if volOpt.readOnly {
mapArgs = append(mapArgs, "--read-only") mapArgs = append(mapArgs, "--read-only")
} }
if volOpt.MapOptions != "" {
mapArgs = append(mapArgs, "--options", volOpt.MapOptions)
}
// Execute map // Execute map
stdout, stderr, err := util.ExecCommand(ctx, rbd, mapArgs...) stdout, stderr, err := util.ExecCommand(ctx, rbd, mapArgs...)
if err != nil { if err != nil {
@ -310,14 +317,8 @@ func detachRBDImageOrDeviceSpec(ctx context.Context, imageOrDeviceSpec string, i
} }
} }
accessType := accessTypeKRbd unmapArgs := []string{"unmap", imageOrDeviceSpec}
if isNbd { unmapArgs = appendDeviceTypeAndOptions(unmapArgs, isNbd, unmapOptions)
accessType = accessTypeNbd
}
unmapArgs := []string{"unmap", "--device-type", accessType, imageOrDeviceSpec}
if unmapOptions != "" {
unmapArgs = append(unmapArgs, "--options", unmapOptions)
}
_, stderr, err := util.ExecCommand(ctx, rbd, unmapArgs...) _, stderr, err := util.ExecCommand(ctx, rbd, unmapArgs...)
if err != nil { if err != nil {