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

Merge pull request #193 from gman0/fix-cephfs-volcleanup

Browse Source 
cephfs/volume: fixed incorrect path for unmountAndRemove
This commit is contained in:
Róbert Vašek 2019-02-12 18:02:44 +01:00 committed by GitHub
commit 890740553f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/cephfs/volume.go
View File

@ -71,9 +71,7 @@ func createVolume(volOptions *volumeOptions, adminCr *credentials, volID volumeI
return fmt.Errorf("error mounting ceph root: %v", err)
}
defer func() {
umountAndRemove(cephRoot)
}()
defer unmountAndRemove(cephRoot)
volOptions.RootPath = getVolumeRootPathCeph(volID)
localVolRoot := getCephRootVolumePathLocal(volID)
@ -123,9 +121,7 @@ func purgeVolume(volID volumeID, adminCr *credentials, volOptions *volumeOptions
return fmt.Errorf("error mounting ceph root: %v", err)
}
defer func() {
umountAndRemove(volRoot)
}()
defer unmountAndRemove(cephRoot)
if err := os.Rename(volRoot, volRootDeleting); err != nil {
return fmt.Errorf("coudln't mark volume %s for deletion: %v", volID, err)
@ -138,7 +134,7 @@ func purgeVolume(volID volumeID, adminCr *credentials, volOptions *volumeOptions
return nil
}
func umountAndRemove(mountPoint string) {
func unmountAndRemove(mountPoint string) {
var err error
if err = unmountVolume(mountPoint); err != nil {
klog.Errorf("failed to unmount %s with error %s", mountPoint, err)