github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-24 20:24:09 +00:00
Code Issues Projects Releases Wiki Activity

Rename IsBindMountExist to IsDeviceBindMountExist

Browse Source
This commit is contained in:
Masaki Kimura 2019-11-12 15:12:51 +00:00
parent bee6514d79
commit dd945424e1
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/volume/testing/testing.go
View File

@ -1158,7 +1158,7 @@ func (fv *FakeVolumePathHandler) IsSymlinkExist(mapPath string) (bool, error) {
return true, nil return true, nil
} }
func (fv *FakeVolumePathHandler) IsBindMountExist(mapPath string) (bool, error) { func (fv *FakeVolumePathHandler) IsDeviceBindMountExist(mapPath string) (bool, error) {
// nil is success, else error // nil is success, else error
return true, nil return true, nil
} }

11
pkg/volume/util/volumepathhandler/volume_path_handler.go
View File

@ -45,8 +45,8 @@ type BlockVolumePathHandler interface {
RemoveMapPath(mapPath string) error RemoveMapPath(mapPath string) error
// IsSymlinkExist retruns true if specified symbolic link exists // IsSymlinkExist retruns true if specified symbolic link exists
IsSymlinkExist(mapPath string) (bool, error) IsSymlinkExist(mapPath string) (bool, error)
// IsBindMountExist retruns true if specified bind mount exists // IsDeviceBindMountExist retruns true if specified bind mount exists
IsBindMountExist(mapPath string) (bool, error) IsDeviceBindMountExist(mapPath string) (bool, error)
// GetDeviceBindMountRefs searches bind mounts under global map path // GetDeviceBindMountRefs searches bind mounts under global map path
GetDeviceBindMountRefs(devPath string, mapPath string) ([]string, error) GetDeviceBindMountRefs(devPath string, mapPath string) ([]string, error)
// FindGlobalMapPathUUIDFromPod finds {pod uuid} symbolic link under globalMapPath // FindGlobalMapPathUUIDFromPod finds {pod uuid} symbolic link under globalMapPath
@ -119,7 +119,6 @@ func mapBindMountDevice(v VolumePathHandler, devicePath string, mapPath string,
return fmt.Errorf("failed to stat file %s: %v", linkPath, err) return fmt.Errorf("failed to stat file %s: %v", linkPath, err)
} }
klog.Warningf("Warning: Path to bind mount %v has not yet been created", linkPath)
// Create file // Create file
newFile, err := os.OpenFile(linkPath, os.O_CREATE|os.O_RDWR, 0750) newFile, err := os.OpenFile(linkPath, os.O_CREATE|os.O_RDWR, 0750)
if err != nil { if err != nil {
@ -176,7 +175,7 @@ func (v VolumePathHandler) UnmapDevice(mapPath string, linkName string, bindMoun
func unmapBindMountDevice(v VolumePathHandler, mapPath string, linkName string) error { func unmapBindMountDevice(v VolumePathHandler, mapPath string, linkName string) error {
// Check bind mount exists // Check bind mount exists
linkPath := filepath.Join(mapPath, string(linkName)) linkPath := filepath.Join(mapPath, string(linkName))
if isMountExist, checkErr := v.IsBindMountExist(linkPath); checkErr != nil { if isMountExist, checkErr := v.IsDeviceBindMountExist(linkPath); checkErr != nil {
return checkErr return checkErr
} else if !isMountExist { } else if !isMountExist {
klog.Warningf("Warning: Unmap skipped because bind mount does not exist on the path: %v", linkPath) klog.Warningf("Warning: Unmap skipped because bind mount does not exist on the path: %v", linkPath)
@ -244,10 +243,10 @@ func (v VolumePathHandler) IsSymlinkExist(mapPath string) (bool, error) {
return false, nil return false, nil
} }
// IsBindMountExist returns true if specified file exists and the type is device. // IsDeviceBindMountExist returns true if specified file exists and the type is device.
// If file doesn't exist, or file exists but not device, return false with no error. // If file doesn't exist, or file exists but not device, return false with no error.
// On other cases, return false with error from Lstat(). // On other cases, return false with error from Lstat().
func (v VolumePathHandler) IsBindMountExist(mapPath string) (bool, error) { func (v VolumePathHandler) IsDeviceBindMountExist(mapPath string) (bool, error) {
fi, err := os.Lstat(mapPath) fi, err := os.Lstat(mapPath)
if err != nil { if err != nil {
// If file doesn't exist, return false and no error // If file doesn't exist, return false and no error