github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

check function return err

pull/6/head
zouyee 2017-12-19 23:24:35 +08:00
parent 622386e531
commit b6e1fecde7
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/volume/cephfs/cephfs.go
View File

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

5
pkg/volume/glusterfs/glusterfs.go
View File

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