github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-07 11:13:48 +00:00
Code Issues Projects Releases Wiki Activity

RBD return output in error case

Browse Source
This commit is contained in:
Sami Wagiaalla 2016-01-13 15:57:36 -05:00
parent e20a0db159
commit 52c9a3abe2
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -210,6 +210,7 @@ func (util *RBDUtil) defencing(c rbdCleaner) error {
func (util *RBDUtil) AttachDisk(b rbdBuilder) error { func (util *RBDUtil) AttachDisk(b rbdBuilder) error {
var err error var err error
var output []byte
devicePath, found := waitForPath(b.Pool, b.Image, 1) devicePath, found := waitForPath(b.Pool, b.Image, 1)
if !found { if !found {
@ -227,18 +228,19 @@ func (util *RBDUtil) AttachDisk(b rbdBuilder) error {
mon := b.Mon[i%l] mon := b.Mon[i%l]
glog.V(1).Infof("rbd: map mon %s", mon) glog.V(1).Infof("rbd: map mon %s", mon)
if b.Secret != "" { if b.Secret != "" {
_, err = b.plugin.execCommand("rbd", output, err = b.plugin.execCommand("rbd",
[]string{"map", b.Image, "--pool", b.Pool, "--id", b.Id, "-m", mon, "--key=" + b.Secret}) []string{"map", b.Image, "--pool", b.Pool, "--id", b.Id, "-m", mon, "--key=" + b.Secret})
} else { } else {
_, err = b.plugin.execCommand("rbd", output, err = b.plugin.execCommand("rbd",
[]string{"map", b.Image, "--pool", b.Pool, "--id", b.Id, "-m", mon, "-k", b.Keyring}) []string{"map", b.Image, "--pool", b.Pool, "--id", b.Id, "-m", mon, "-k", b.Keyring})
} }
if err == nil { if err == nil {
break break
} }
glog.V(1).Infof("rbd: map error %v %s", err, string(output))
} }
if err != nil { if err != nil {
return err return fmt.Errorf("rbd: map failed %v %s", err, string(output))
} }
devicePath, found = waitForPath(b.Pool, b.Image, 10) devicePath, found = waitForPath(b.Pool, b.Image, 10)
if !found { if !found {