mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2024-11-26 16:20:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

cephfs/util: log execCommandJson; cache mount.New() instance

Browse Source
This commit is contained in:
gman 2018-08-28 10:19:28 +02:00
parent 12958d0a9a
commit 9c3389d784
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/cephfs/util.go
View File

@ -54,8 +54,7 @@ func execCommandAndValidate(program string, args ...string) error {
} }
func execCommandJson(v interface{}, program string, args ...string) error { func execCommandJson(v interface{}, program string, args ...string) error {
cmd := exec.Command(program, args...) out, err := execCommand(program, args...)
out, err := cmd.CombinedOutput()
if err != nil { if err != nil {
return fmt.Errorf("cephfs: %s failed with following error: %s\ncephfs: %s output: %s", program, err, program, out) return fmt.Errorf("cephfs: %s failed with following error: %s\ncephfs: %s output: %s", program, err, program, out)
@ -64,8 +63,11 @@ func execCommandJson(v interface{}, program string, args ...string) error {
return json.NewDecoder(bytes.NewReader(out)).Decode(v) return json.NewDecoder(bytes.NewReader(out)).Decode(v)
} }
// Used in isMountPoint()
var dummyMount = mount.New("")
func isMountPoint(p string) (bool, error) { func isMountPoint(p string) (bool, error) {
notMnt, err := mount.New("").IsLikelyNotMountPoint(p) notMnt, err := dummyMount.IsLikelyNotMountPoint(p)
if err != nil { if err != nil {
return false, status.Error(codes.Internal, err.Error()) return false, status.Error(codes.Internal, err.Error())
} }