From 9c3389d78450820afe8a74ef7704a76708c660c4 Mon Sep 17 00:00:00 2001 From: gman Date: Tue, 28 Aug 2018 10:19:28 +0200 Subject: [PATCH] cephfs/util: log execCommandJson; cache mount.New() instance --- pkg/cephfs/util.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkg/cephfs/util.go b/pkg/cephfs/util.go index 7007d3ce8..ff2655254 100644 --- a/pkg/cephfs/util.go +++ b/pkg/cephfs/util.go @@ -54,8 +54,7 @@ func execCommandAndValidate(program string, args ...string) error { } func execCommandJson(v interface{}, program string, args ...string) error { - cmd := exec.Command(program, args...) - out, err := cmd.CombinedOutput() + out, err := execCommand(program, args...) if err != nil { 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) } +// Used in isMountPoint() +var dummyMount = mount.New("") + func isMountPoint(p string) (bool, error) { - notMnt, err := mount.New("").IsLikelyNotMountPoint(p) + notMnt, err := dummyMount.IsLikelyNotMountPoint(p) if err != nil { return false, status.Error(codes.Internal, err.Error()) }