github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix flexvol stuck issue due to corrupted mnt point 

fix comments about PathExists

fix comments

revert change in PathExists func
k3s-v1.14.4
andyzhangx 2019-04-26 13:29:48 +00:00
parent d1c99590f4
commit e7c82c0250
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/volume/flexvolume/unmounter.go
View File

@ -42,15 +42,15 @@ func (f *flexVolumeUnmounter) TearDown() error {
} }
func (f *flexVolumeUnmounter) TearDownAt(dir string) error { func (f *flexVolumeUnmounter) TearDownAt(dir string) error {
pathExists, pathErr := mount.PathExists(dir) pathExists, pathErr := mount.PathExists(dir)
if !pathExists { if pathErr != nil {
klog.Warningf("Warning: Unmount skipped because path does not exist: %v", dir) // only log warning here since plugins should anyways have to deal with errors
return nil klog.Warningf("Error checking path: %v", pathErr)
} } else {
if !pathExists {
if pathErr != nil && !mount.IsCorruptedMnt(pathErr) { klog.Warningf("Warning: Unmount skipped because path does not exist: %v", dir)
return fmt.Errorf("Error checking path: %v", pathErr) return nil
}
} }
call := f.plugin.NewDriverCall(unmountCmd) call := f.plugin.NewDriverCall(unmountCmd)