github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 13:37:30 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #75234 from andyzhangx/corrupt-mnt-fix

Browse Source 
fix pod stuck issue due to corrupt mnt point in flexvol plugin
This commit is contained in:
Kubernetes Prow Robot 2019-06-13 20:36:34 -07:00 committed by GitHub
commit 3a598d7f92
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
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 pathErr != nil {
// only log warning here since plugins should anyways have to deal with errors
klog.Warningf("Error checking path: %v", pathErr)
} else {
if !pathExists { if !pathExists {
klog.Warningf("Warning: Unmount skipped because path does not exist: %v", dir) klog.Warningf("Warning: Unmount skipped because path does not exist: %v", dir)
return nil return nil
} }
if pathErr != nil && !mount.IsCorruptedMnt(pathErr) {
return fmt.Errorf("Error checking path: %v", pathErr)
} }
call := f.plugin.NewDriverCall(unmountCmd) call := f.plugin.NewDriverCall(unmountCmd)