Merge pull request #61389 from linyouchong/linyouchong-20180320

Automatic merge from submit-queue. 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>. csiAttacher: check deviceMountPath before hasStageUnstageCapability csiAttacher#MountDevice: it is better to check `deviceMountPath` before `hasStageUnstageCapability` **Release note**: ``` NONE ``` /release-note-none /kind cleanup /sig storage

Merge pull request #61389 from linyouchong/linyouchong-20180320
b95ae931 · Kubernetes Submit Queue · GitHub · 5b82745c · 51e81d25 · b95ae931
Unverified Commit b95ae931 authored Aug 03, 2018 by Kubernetes Submit Queue Committed by GitHub Aug 03, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 5 deletions

csi_attacher.go pkg/volume/csi/csi_attacher.go +5 -5

No files found.
--- a/pkg/volume/csi/csi_attacher.go
+++ b/pkg/volume/csi/csi_attacher.go
@@ -248,6 +248,11 @@ func (c *csiAttacher) GetDeviceMountPath(spec *volume.Spec) (string, error) {
 func (c *csiAttacher) MountDevice(spec *volume.Spec, devicePath string, deviceMountPath string) (err error) {
 	glog.V(4).Infof(log("attacher.MountDevice(%s, %s)", devicePath, deviceMountPath))

+	if deviceMountPath == "" {
+		err = fmt.Errorf("attacher.MountDevice failed, deviceMountPath is empty")
+		return err
+	}
+
 	mounted, err := isDirMounted(c.plugin, deviceMountPath)
 	if err != nil {
 		glog.Error(log("attacher.MountDevice failed while checking mount status for dir [%s]", deviceMountPath))
@@ -317,11 +322,6 @@ func (c *csiAttacher) MountDevice(spec *volume.Spec, devicePath string, deviceMo
 	}

 	// Start MountDevice
-	if deviceMountPath == "" {
-		err = fmt.Errorf("attacher.MountDevice failed, deviceMountPath is empty")
-		return err
-	}
-
 	nodeName := string(c.plugin.host.GetNodeName())
 	attachID := getAttachmentName(csiSource.VolumeHandle, csiSource.Driver, nodeName)