github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #81204 from codenrhoden/rename-hu-pathexists

Browse Source 
Rename HostUtils.ExistsPath to PathExists
This commit is contained in:
Kubernetes Prow Robot
2019-08-12 20:12:12 -07:00
committed by GitHub
parent 56b5f8b47c 14e25b7c04
commit 76e19a1619
11 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/util/mount/fake.go
View File

@@ -247,8 +247,8 @@ func (hu *FakeHostUtil) MakeFile(pathname string) error {
return nil
}
// ExistsPath checks if pathname exists.
func (hu *FakeHostUtil) ExistsPath(pathname string) (bool, error) {
// PathExists checks if pathname exists.
func (hu *FakeHostUtil) PathExists(pathname string) (bool, error) {
if _, ok := hu.Filesystem[pathname]; ok {
return true, nil
}

3
pkg/util/mount/mount.go
View File

@@ -91,8 +91,9 @@ type HostUtils interface {
MakeFile(pathname string) error
// MakeDir creates a new directory.
MakeDir(pathname string) error
// PathExists tests if the given path already exists
// Error is returned on any other error than "file not found".
ExistsPath(pathname string) (bool, error)
PathExists(pathname string) (bool, error)
// EvalHostSymlinks returns the path name after evaluating symlinks.
EvalHostSymlinks(pathname string) (string, error)
// GetOwner returns the integer ID for the user and group of the given path

2
pkg/util/mount/mount_helper_common.go
View File

@@ -28,8 +28,6 @@ import (
// called instead of IsLikelyNotMountPoint. IsNotMountPoint is more expensive
// but properly handles bind mounts within the same fs.
func CleanupMountPoint(mountPath string, mounter Interface, extensiveMountPointCheck bool) error {
// mounter.ExistsPath cannot be used because for containerized kubelet, we need to check
// the path in the kubelet container, not on the host.
pathExists, pathErr := PathExists(mountPath)
if !pathExists {
klog.Warningf("Warning: Unmount skipped because path does not exist: %v", mountPath)

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

@@ -582,7 +582,7 @@ func (hu *hostUtil) MakeFile(pathname string) error {
return nil
}
func (hu *hostUtil) ExistsPath(pathname string) (bool, error) {
func (hu *hostUtil) PathExists(pathname string) (bool, error) {
return utilpath.Exists(utilpath.CheckFollowSymlink, pathname)
}

2
pkg/util/mount/mount_unsupported.go
View File

@@ -121,7 +121,7 @@ func (hu *hostUtil) MakeDir(pathname string) error {
return errUnsupported
}
func (hu *hostUtil) ExistsPath(pathname string) (bool, error) {
func (hu *hostUtil) PathExists(pathname string) (bool, error) {
return true, errUnsupported
}

6
pkg/util/mount/mount_windows.go
View File

@@ -186,7 +186,7 @@ func (mounter *Mounter) IsLikelyNotMountPoint(file string) (bool, error) {
return true, fmt.Errorf("readlink error: %v", err)
}
hu := NewHostUtil()
exists, err := hu.ExistsPath(target)
exists, err := hu.PathExists(target)
if err != nil {
return true, err
}
@@ -393,8 +393,8 @@ func (hu *hostUtil) MakeFile(pathname string) error {
return nil
}
// ExistsPath checks whether the path exists
func (hu *hostUtil) ExistsPath(pathname string) (bool, error) {
// PathExists checks whether the path exists
func (hu *hostUtil) PathExists(pathname string) (bool, error) {
return utilpath.Exists(utilpath.CheckFollowSymlink, pathname)
}