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

Merge pull request #6945 from eparis/IsMountPoint

Browse Source 
Rename IsMountPoint to IsLikelyNotMountPoint
This commit is contained in:
Saad Ali
2015-08-19 12:47:51 -07:00
parent ed36bfa860 f125ad88ce
commit b05cab0bc5
19 changed files with 116 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/volume/secret/secret.go
View File

@@ -111,7 +111,7 @@ func (b *secretVolumeBuilder) getMetaDir() string {
}
func (b *secretVolumeBuilder) SetUpAt(dir string) error {
isMnt, err := b.mounter.IsMountPoint(dir)
notMnt, err := b.mounter.IsLikelyNotMountPoint(dir)
// Getting an os.IsNotExist err from is a contingency; the directory
// may not exist yet, in which case, setup should run.
if err != nil && !os.IsNotExist(err) {
@@ -120,7 +120,7 @@ func (b *secretVolumeBuilder) SetUpAt(dir string) error {
// If the plugin readiness file is present for this volume and
// the setup dir is a mountpoint, this volume is already ready.
if volumeutil.IsReady(b.getMetaDir()) && isMnt {
if volumeutil.IsReady(b.getMetaDir()) && !notMnt {
return nil
}