github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-11-21 18:54:41 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #74625 from davidz627/fix/xfsUnmount

Browse Source 
GetMountRefs fixed to handle corrupted mounts by treating it like an unmounted volume
This commit is contained in:
Kubernetes Prow Robot
2019-03-06 20:35:26 -08:00
committed by GitHub
parent bd8eeaaaaf 5bf970f848
commit 59ee7353e8
4 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/util/mount/mount_linux.go
View File

@@ -718,10 +718,14 @@ func getSELinuxSupport(path string, mountInfoFilename string) (bool, error) {
}
func (mounter *Mounter) GetMountRefs(pathname string) ([]string, error) {
if _, err := os.Stat(pathname); os.IsNotExist(err) {
pathExists, pathErr := PathExists(pathname)
if !pathExists {
return []string{}, nil
} else if err != nil {
return nil, err
} else if IsCorruptedMnt(pathErr) {
klog.Warningf("GetMountRefs found corrupted mount at %s, treating as unmounted path", pathname)
return []string{}, nil
} else if pathErr != nil {
return nil, fmt.Errorf("error checking path %s: %v", pathname, pathErr)
}
realpath, err := filepath.EvalSymlinks(pathname)
if err != nil {