Skip to content

Commit

Permalink
Merge pull request kubernetes#56851 from zouyee/ceph-1
Browse files Browse the repository at this point in the history
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

```
  • Loading branch information
Kubernetes Submit Queue authored Jan 10, 2018
2 parents 3af0b57 + b6e1fec commit 6b925ac
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
6 changes: 5 additions & 1 deletion pkg/volume/cephfs/cephfs.go
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand All @@ -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.
Expand Down
5 changes: 3 additions & 2 deletions pkg/volume/glusterfs/glusterfs.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 6b925ac

Please sign in to comment.