github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-24 20:24:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #78839 from tedyu/cleaner-err

Browse Source 
Check correct error for cleanup in csiAttacher#MountDevice
This commit is contained in:
Kubernetes Prow Robot 2019-06-14 20:47:01 -07:00 committed by GitHub
commit bde744eb97
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -326,7 +326,7 @@ func (c *csiAttacher) MountDevice(spec *volume.Spec, devicePath string, deviceMo
} }
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)) klog.Error(log("failed to save volume info data: %v", err))
if cleanerr := os.RemoveAll(dataDir); err != nil { if cleanerr := os.RemoveAll(dataDir); cleanerr != nil {
klog.Error(log("failed to remove dir after error [%s]: %v", dataDir, cleanerr)) klog.Error(log("failed to remove dir after error [%s]: %v", dataDir, cleanerr))
} }
return err return err