github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-31 23:37:01 +00:00
Code Issues Projects Releases Wiki Activity

RBD Plugin: Fix bug in checking command not found error.

Browse Source
This commit is contained in:
Yecheng Fu 2017-10-25 16:34:22 +08:00
parent 6e950cc629
commit ff639e80e8
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,6 +27,7 @@ import (
"io/ioutil"
"math/rand"
"os"
"os/exec"
"path"
"regexp"
"strings"
@ -43,7 +44,6 @@ import (
const (
imageWatcherStr = "watcher="
kubeLockMagic = "kubelet_lock_magic_"
rbdCmdErr = "executable file not found in $PATH"
)
// search /sys/bus for rbd device that matches given pool and image
@ -117,8 +117,10 @@ func (util *RBDUtil) MakeGlobalPDName(rbd rbd) string {
}
func rbdErrors(runErr, resultErr error) error {
if runErr.Error() == rbdCmdErr {
return fmt.Errorf("rbd: rbd cmd not found")
if err, ok := runErr.(*exec.Error); ok {
if err.Err == exec.ErrNotFound {
return fmt.Errorf("rbd: rbd cmd not found")
}
}
return resultErr
}
@ -479,10 +481,12 @@ func (util *RBDUtil) rbdStatus(b *rbdMounter) (bool, string, error) {
break
}
if err.Error() == rbdCmdErr {
glog.Errorf("rbd cmd not found")
// fail fast if command not found
return false, output, err
if err, ok := err.(*exec.Error); ok {
if err.Err == exec.ErrNotFound {
glog.Errorf("rbd cmd not found")
// fail fast if command not found
return false, output, err
}
}
}