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

Merge pull request #506 from Madhu-1/unmap

Browse Source 
unmap rbd volume if we fail to get devicepath
This commit is contained in:
Humble Devassy Chirammal 2019-07-29 13:56:17 +05:30 committed by GitHub
commit fde2a666ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/rbd/rbd_attach.go
View File

@ -284,6 +284,11 @@ func createPath(volOpt *rbdVolume, cr *util.Credentials) (string, error) {
} }
devicePath, found := waitForPath(volOpt.Pool, image, 10, useNBD) devicePath, found := waitForPath(volOpt.Pool, image, 10, useNBD)
if !found { if !found {
output, err := execCommand(cmdName, []string{
"unmap", imagePath, "--id", cr.ID, "-m", volOpt.Monitors, "--keyfile=" + cr.KeyFile})
if err != nil {
klog.Warningf("rbd: unmap error %v, rbd output: %s", err, string(output))
}
return "", fmt.Errorf("could not map image %s, Timeout after 10s", imagePath) return "", fmt.Errorf("could not map image %s, Timeout after 10s", imagePath)
} }
return devicePath, nil return devicePath, nil