diff --git a/pkg/volume/cephfs/cephfs.go b/pkg/volume/cephfs/cephfs.go index 83743876401..1b05a52856a 100644 --- a/pkg/volume/cephfs/cephfs.go +++ b/pkg/volume/cephfs/cephfs.go @@ -239,7 +239,7 @@ func (cephfsVolume *cephfsMounter) SetUpAt(dir string, fsGroup *int64) error { // check whether it belongs to fuse, if not, default to use kernel mount. if cephfsVolume.checkFuseMount() { - glog.V(4).Infof("CephFS fuse mount.") + glog.V(4).Info("CephFS fuse mount.") err = cephfsVolume.execFuseMount(dir) // cleanup no matter if fuse mount fail. keyringPath := cephfsVolume.GetKeyringPath() @@ -255,7 +255,7 @@ func (cephfsVolume *cephfsMounter) SetUpAt(dir string, fsGroup *int64) error { glog.V(4).Infof("CephFS fuse mount failed: %v, fallback to kernel mount.", err) } } - glog.V(4).Infof("CephFS kernel mount.") + glog.V(4).Info("CephFS kernel mount.") err = cephfsVolume.execMount(dir) if err != nil { @@ -336,7 +336,7 @@ func (cephfsMounter *cephfsMounter) checkFuseMount() bool { switch runtime.GOOS { case "linux": if _, err := execute.Run("/usr/bin/test", "-x", "/sbin/mount.fuse.ceph"); err == nil { - glog.V(4).Infof("/sbin/mount.fuse.ceph exists, it should be fuse mount.") + glog.V(4).Info("/sbin/mount.fuse.ceph exists, it should be fuse mount.") return true } return false @@ -351,7 +351,7 @@ func (cephfsVolume *cephfs) execFuseMount(mountpoint string) error { if cephfsVolume.secret != "" { // TODO: cephfs fuse currently doesn't support secret option, // remove keyring file create once secret option is supported. - glog.V(4).Infof("cephfs mount begin using fuse.") + glog.V(4).Info("cephfs mount begin using fuse.") keyringPath := cephfsVolume.GetKeyringPath() os.MkdirAll(keyringPath, 0750) diff --git a/pkg/volume/cephfs/cephfs_test.go b/pkg/volume/cephfs/cephfs_test.go index b09011df25a..82095978ae8 100644 --- a/pkg/volume/cephfs/cephfs_test.go +++ b/pkg/volume/cephfs/cephfs_test.go @@ -77,13 +77,13 @@ func TestPlugin(t *testing.T) { } mounter, err := plug.(*cephfsPlugin).newMounterInternal(volume.NewSpecFromVolume(spec), types.UID("poduid"), &mount.FakeMounter{}, "secrets") - volumePath := mounter.GetPath() if err != nil { t.Errorf("Failed to make a new Mounter: %v", err) } if mounter == nil { t.Errorf("Got a nil Mounter") } + volumePath := mounter.GetPath() volpath := path.Join(tmpDir, "pods/poduid/volumes/kubernetes.io~cephfs/vol1") if volumePath != volpath { t.Errorf("Got unexpected path: %s", volumePath)