Merge pull request #56851 from zouyee/ceph-1

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>. check function return err **What this PR does / why we need it**: check function return err **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 # **Special notes for your reviewer**: **Release note**: ```NONE ```

Merge pull request #56851 from zouyee/ceph-1
6b925ac2 · Kubernetes Submit Queue · GitHub · 3af0b57e · b6e1fecd · 6b925ac2
Unverified Commit 6b925ac2 authored Jan 10, 2018 by Kubernetes Submit Queue Committed by GitHub Jan 10, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 3 deletions

cephfs.go pkg/volume/cephfs/cephfs.go +5 -1

glusterfs.go pkg/volume/glusterfs/glusterfs.go +3 -2

No files found.
--- a/pkg/volume/cephfs/cephfs.go
+++ b/pkg/volume/cephfs/cephfs.go
@@ -232,7 +232,10 @@ func (cephfsVolume *cephfsMounter) SetUpAt(dir string, fsGroup *int64) error {
 	if !notMnt {
 		return nil
 	}
-	os.MkdirAll(dir, 0750)
+
+	if err := os.MkdirAll(dir, 0750); err != nil {
+		return err
+	}

 	// check whether it belongs to fuse, if not, default to use kernel mount.
 	if cephfsVolume.checkFuseMount() {
@@ -253,6 +256,7 @@ func (cephfsVolume *cephfsMounter) SetUpAt(dir string, fsGroup *int64) error {
 		}
 	}
 	glog.V(4).Infof("CephFS kernel mount.")
+
 	err = cephfsVolume.execMount(dir)
 	if err != nil {
 		// cleanup upon failure.

--- a/pkg/volume/glusterfs/glusterfs.go
+++ b/pkg/volume/glusterfs/glusterfs.go
@@ -262,8 +262,9 @@ func (b *glusterfsMounter) SetUpAt(dir string, fsGroup *int64) error {
 	if !notMnt {
 		return nil
 	}
-
-	os.MkdirAll(dir, 0750)
+	if err := os.MkdirAll(dir, 0750); err != nil {
+		return err
+	}
 	err = b.setUpAtInternal(dir)
 	if err == nil {
 		return nil