github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 09:22:44 +00:00
Code Issues Projects Releases Wiki Activity

do not remove volume dir when saveVolumeData fails

Browse Source
This commit is contained in:
fankangbest 2020-03-25 14:00:56 +08:00 committed by Christian Huffman
parent 22dabe6fea
commit b9afd2d34a
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/volume/csi/csi_attacher.go
View File

@ -297,11 +297,9 @@ func (c *csiAttacher) MountDevice(spec *volume.Spec, devicePath string, deviceMo
volDataKey.driverName: csiSource.Driver, volDataKey.driverName: csiSource.Driver,
} }
if err = saveVolumeData(dataDir, volDataFileName, data); err != nil { if err = saveVolumeData(dataDir, volDataFileName, data); err != nil {
klog.Error(log("failed to save volume info data: %v", err)) errMsg := log("failed to save volume info data: %v", err)
if cleanErr := os.RemoveAll(dataDir); cleanErr != nil { klog.Error(errMsg)
klog.Error(log("failed to remove dir after error [%s]: %v", dataDir, cleanErr)) return errors.New(errMsg)
}
return err
} }
defer func() { defer func() {
// Only if there was an error and volume operation was considered // Only if there was an error and volume operation was considered

11
pkg/volume/csi/csi_plugin.go
View File

@ -457,10 +457,15 @@ func (p *csiPlugin) NewMounter(
volData[volDataKey.attachmentID] = attachID volData[volDataKey.attachmentID] = attachID
if err := saveVolumeData(dataDir, volDataFileName, volData); err != nil { if err := saveVolumeData(dataDir, volDataFileName, volData); err != nil {
if removeErr := os.RemoveAll(dataDir); removeErr != nil { errorMsg := log("csi.NewMounter failed to save volume info data: %v", err)
klog.Error(log("failed to remove dir after error [%s]: %v", dataDir, removeErr)) klog.Error(errorMsg)
// attempt to cleanup volume mount dir.
if removeMountDirErr := removeMountDir(p, dir); removeMountDirErr != nil {
klog.Error(log("csi.NewMounter failed to remove mount dir [%s]: %v", dir, removeMountDirErr))
} }
return nil, errors.New(log("failed to save volume info data: %v", err))
return nil, errors.New(errorMsg)
} }
klog.V(4).Info(log("mounter created successfully")) klog.V(4).Info(log("mounter created successfully"))