github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix incorrect log

Browse Source
This commit is contained in:
linyouchong
2017-12-13 18:02:16 +08:00
parent 38e3351312
commit 9c3b2a00ac
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/volume/csi/csi_mounter.go
View File

@@ -269,21 +269,21 @@ func (c *csiMountMgr) TearDownAt(dir string) error {
// TODO make all assertion calls private within the client itself
if err := csi.AssertSupportedVersion(ctx, csiVersion); err != nil {
glog.Errorf(log("mounter.SetUpAt failed to assert version: %v", err))
glog.Errorf(log("mounter.TearDownAt failed to assert version: %v", err))
return err
}
if err := csi.NodeUnpublishVolume(ctx, volID, dir); err != nil {
glog.Errorf(log("mounter.SetUpAt failed: %v", err))
glog.Errorf(log("mounter.TearDownAt failed: %v", err))
return err
}
// clean mount point dir
if err := removeMountDir(c.plugin, dir); err != nil {
glog.Error(log("mounter.SetUpAt failed to clean mount dir [%s]: %v", dir, err))
glog.Error(log("mounter.TearDownAt failed to clean mount dir [%s]: %v", dir, err))
return err
}
glog.V(4).Infof(log("mounte.SetUpAt successfully unmounted dir [%s]", dir))
glog.V(4).Infof(log("mounte.TearDownAt successfully unmounted dir [%s]", dir))
return nil
}

6
pkg/volume/csi/csi_plugin_test.go
View File

@@ -230,11 +230,11 @@ func TestPluginNewUnmounter(t *testing.T) {
csiUnmounter := unmounter.(*csiMountMgr)
if err != nil {
t.Fatalf("Failed to make a new Mounter: %v", err)
t.Fatalf("Failed to make a new Unmounter: %v", err)
}
if csiUnmounter == nil {
t.Fatal("failed to create CSI mounter")
t.Fatal("failed to create CSI Unmounter")
}
if csiUnmounter.podUID != testPodUID {
@@ -305,6 +305,6 @@ func TestPluginNewDetacher(t *testing.T) {
t.Error("plugin not set for detacher")
}
if csiDetacher.k8s == nil {
t.Error("Kubernetes client not set for attacher")
t.Error("Kubernetes client not set for detacher")
}
}