github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 09:49:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #17192 from SuhasAnand/SuhasAnand-rbd-attachdisk-fix_unnecessary_call

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2016-01-11 22:07:00 -08:00
commit 6f50699b93
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/volume/rbd/rbd_util.go
View File

@ -237,7 +237,6 @@ func (util *RBDUtil) AttachDisk(b rbdBuilder) error {
break break
} }
} }
}
if err != nil { if err != nil {
return err return err
} }
@ -245,6 +244,7 @@ func (util *RBDUtil) AttachDisk(b rbdBuilder) error {
if !found { if !found {
return errors.New("Could not map image: Timeout after 10s") return errors.New("Could not map image: Timeout after 10s")
} }
}
// mount it // mount it
globalPDPath := b.manager.MakeGlobalPDName(*b.rbd) globalPDPath := b.manager.MakeGlobalPDName(*b.rbd)
notMnt, err := b.mounter.IsLikelyNotMountPoint(globalPDPath) notMnt, err := b.mounter.IsLikelyNotMountPoint(globalPDPath)