Merge pull request #56487 from zhangxiaoyu-zidif/fix-binary-check-glusterfs

Automatic merge from submit-queue (batch tested with PRs 56413, 56322, 56490, 56460, 56487). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. fix binary check for glusterfs.go **What this PR does / why we need it**: err check can't show that the binary does not exist. If the binary does not exist, the err still be nil ever. we should use "test -x" to check if the binary exist. **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes #56479 **Special notes for your reviewer**: **Release note**: ```release-note NONE ```

Merge pull request #56487 from zhangxiaoyu-zidif/fix-binary-check-glusterfs
e9e190c5 · Kubernetes Submit Queue · GitHub · d9b45d08 · cbf0945a · e9e190c5
Unverified Commit e9e190c5 authored Dec 15, 2017 by Kubernetes Submit Queue Committed by GitHub Dec 15, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

glusterfs.go pkg/volume/glusterfs/glusterfs.go +1 -1

No files found.
--- a/pkg/volume/glusterfs/glusterfs.go
+++ b/pkg/volume/glusterfs/glusterfs.go
@@ -238,7 +238,7 @@ func (b *glusterfsMounter) CanMount() error {
 	exe := b.plugin.host.GetExec(b.plugin.GetPluginName())
 	switch runtime.GOOS {
 	case "linux":
-		if _, err := exe.Run("/bin/ls", gciLinuxGlusterMountBinaryPath); err != nil {
+		if _, err := exe.Run("test", "-x", gciLinuxGlusterMountBinaryPath); err != nil {
 			return fmt.Errorf("Required binary %s is missing", gciLinuxGlusterMountBinaryPath)
 		}
 	}