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

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2016-01-11 22:07:00 -08:00
commit 6f50699b93

View File

@ -237,13 +237,13 @@ func (util *RBDUtil) AttachDisk(b rbdBuilder) error {
break break
} }
} }
} if err != nil {
if err != nil { return err
return err }
} devicePath, found = waitForPath(b.Pool, b.Image, 10)
devicePath, found = waitForPath(b.Pool, b.Image, 10) 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)