github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-12 05:21:58 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'fix-fc-swallowed-error' into fix-storageos-swallowed-err

Browse Source
This commit is contained in:
Lars Lehtonen 2017-08-26 14:46:36 -07:00
commit 30b9038bbb
No known key found for this signature in database
GPG Key ID: 8137D474EBCB04F2
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/volume/fc/fc_util.go
View File

@ -220,6 +220,9 @@ func (util *FCUtil) AttachDisk(b fcDiskMounter) (string, error) {
// mount it // mount it
globalPDPath := util.MakeGlobalPDName(*b.fcDisk) globalPDPath := util.MakeGlobalPDName(*b.fcDisk)
noMnt, err := b.mounter.IsLikelyNotMountPoint(globalPDPath) noMnt, err := b.mounter.IsLikelyNotMountPoint(globalPDPath)
if err != nil {
return devicePath, fmt.Errorf("Heuristic determination of mount point failed:%v", err)
}
if !noMnt { if !noMnt {
glog.Infof("fc: %s already mounted", globalPDPath) glog.Infof("fc: %s already mounted", globalPDPath)
return devicePath, nil return devicePath, nil