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

Cleanup IsCorruptedMnt callers

pull/564/head
danielqsj 2019-01-08 22:09:36 +08:00
parent 8092904e3c
commit 2426f0ee4e
3 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/volume/flexvolume/detacher.go
View File

@ -24,7 +24,6 @@ import (
"k8s.io/klog" "k8s.io/klog"
"k8s.io/kubernetes/pkg/util/mount" "k8s.io/kubernetes/pkg/util/mount"
"k8s.io/kubernetes/pkg/volume" "k8s.io/kubernetes/pkg/volume"
"k8s.io/kubernetes/pkg/volume/util"
) )
type flexVolumeDetacher struct { type flexVolumeDetacher struct {
@ -57,13 +56,13 @@ func (d *flexVolumeDetacher) UnmountDevice(deviceMountPath string) error {
klog.Warningf("Warning: Unmount skipped because path does not exist: %v", deviceMountPath) klog.Warningf("Warning: Unmount skipped because path does not exist: %v", deviceMountPath)
return nil return nil
} }
if pathErr != nil && !util.IsCorruptedMnt(pathErr) { if pathErr != nil && !mount.IsCorruptedMnt(pathErr) {
return fmt.Errorf("Error checking path: %v", pathErr) return fmt.Errorf("Error checking path: %v", pathErr)
} }
notmnt, err := isNotMounted(d.plugin.host.GetMounter(d.plugin.GetPluginName()), deviceMountPath) notmnt, err := isNotMounted(d.plugin.host.GetMounter(d.plugin.GetPluginName()), deviceMountPath)
if err != nil { if err != nil {
if util.IsCorruptedMnt(err) { if mount.IsCorruptedMnt(err) {
notmnt = false // Corrupted error is assumed to be mounted. notmnt = false // Corrupted error is assumed to be mounted.
} else { } else {
return err return err

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

@ -23,7 +23,6 @@ import (
"k8s.io/klog" "k8s.io/klog"
"k8s.io/kubernetes/pkg/util/mount" "k8s.io/kubernetes/pkg/util/mount"
"k8s.io/kubernetes/pkg/volume" "k8s.io/kubernetes/pkg/volume"
"k8s.io/kubernetes/pkg/volume/util"
"k8s.io/utils/exec" "k8s.io/utils/exec"
) )
@ -50,7 +49,7 @@ func (f *flexVolumeUnmounter) TearDownAt(dir string) error {
return nil return nil
} }
if pathErr != nil && !util.IsCorruptedMnt(pathErr) { if pathErr != nil && !mount.IsCorruptedMnt(pathErr) {
return fmt.Errorf("Error checking path: %v", pathErr) return fmt.Errorf("Error checking path: %v", pathErr)
} }

6
pkg/volume/util/util.go
View File

@ -125,12 +125,6 @@ func SetReady(dir string) {
file.Close() file.Close()
} }
// IsCorruptedMnt return true if err is about corrupted mount point
// TODO: Change callers to call mount pkg directly
func IsCorruptedMnt(err error) bool {
return mount.IsCorruptedMnt(err)
}
// GetSecretForPod locates secret by name in the pod's namespace and returns secret map // GetSecretForPod locates secret by name in the pod's namespace and returns secret map
func GetSecretForPod(pod *v1.Pod, secretName string, kubeClient clientset.Interface) (map[string]string, error) { func GetSecretForPod(pod *v1.Pod, secretName string, kubeClient clientset.Interface) (map[string]string, error) {
secret := make(map[string]string) secret := make(map[string]string)