
This change is for fixing PR #30930. The function should check if the mountpath is still mounted or not. If it is not, it should continue with removing the directory instead of returning error.
111 lines
2.7 KiB
Go
111 lines
2.7 KiB
Go
/*
|
|
Copyright 2015 The Kubernetes Authors.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package util
|
|
|
|
import (
|
|
"fmt"
|
|
"os"
|
|
"path"
|
|
|
|
"github.com/golang/glog"
|
|
"k8s.io/kubernetes/pkg/util/mount"
|
|
)
|
|
|
|
const readyFileName = "ready"
|
|
|
|
// IsReady checks for the existence of a regular file
|
|
// called 'ready' in the given directory and returns
|
|
// true if that file exists.
|
|
func IsReady(dir string) bool {
|
|
readyFile := path.Join(dir, readyFileName)
|
|
s, err := os.Stat(readyFile)
|
|
if err != nil {
|
|
return false
|
|
}
|
|
|
|
if !s.Mode().IsRegular() {
|
|
glog.Errorf("ready-file is not a file: %s", readyFile)
|
|
return false
|
|
}
|
|
|
|
return true
|
|
}
|
|
|
|
// SetReady creates a file called 'ready' in the given
|
|
// directory. It logs an error if the file cannot be
|
|
// created.
|
|
func SetReady(dir string) {
|
|
if err := os.MkdirAll(dir, 0750); err != nil && !os.IsExist(err) {
|
|
glog.Errorf("Can't mkdir %s: %v", dir, err)
|
|
return
|
|
}
|
|
|
|
readyFile := path.Join(dir, readyFileName)
|
|
file, err := os.Create(readyFile)
|
|
if err != nil {
|
|
glog.Errorf("Can't touch %s: %v", readyFile, err)
|
|
return
|
|
}
|
|
file.Close()
|
|
}
|
|
|
|
// UnmountPath is a common unmount routine that unmounts the given path and
|
|
// deletes the remaining directory if successful.
|
|
func UnmountPath(mountPath string, mounter mount.Interface) error {
|
|
if pathExists, pathErr := PathExists(mountPath); pathErr != nil {
|
|
return fmt.Errorf("Error checking if path exists: %v", pathErr)
|
|
} else if !pathExists {
|
|
glog.Warningf("Warning: Unmount skipped because path does not exist: %v", mountPath)
|
|
return nil
|
|
}
|
|
|
|
notMnt, err := mounter.IsLikelyNotMountPoint(mountPath)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if notMnt {
|
|
glog.Warningf("Warning: %q is not a mountpoint, deleting", mountPath)
|
|
return os.Remove(mountPath)
|
|
}
|
|
|
|
// Unmount the mount path
|
|
if err := mounter.Unmount(mountPath); err != nil {
|
|
return err
|
|
}
|
|
notMnt, mntErr := mounter.IsLikelyNotMountPoint(mountPath)
|
|
if mntErr != nil {
|
|
return err
|
|
}
|
|
if notMnt {
|
|
glog.V(4).Info("%q is unmounted, deleting the directory", mountPath)
|
|
return os.Remove(mountPath)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// PathExists returns true if the specified path exists.
|
|
func PathExists(path string) (bool, error) {
|
|
_, err := os.Stat(path)
|
|
if err == nil {
|
|
return true, nil
|
|
} else if os.IsNotExist(err) {
|
|
return false, nil
|
|
} else {
|
|
return false, err
|
|
}
|
|
}
|