Unverified Commit 7887fba3 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub

Merge pull request #60611 from linyouchong/linyouchong-20180228

Automatic merge from submit-queue (batch tested with PRs 59637, 60611, 60788, 60489, 60687). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. delete unused variable delete unused variable in sio_plugin.go **Release note**: ``` NONE ``` /release-note-none /kink cleanup
parents 2cb4297c 62021378
...@@ -417,7 +417,7 @@ func (c *sioClient) WaitForAttachedDevice(token string) (string, error) { ...@@ -417,7 +417,7 @@ func (c *sioClient) WaitForAttachedDevice(token string) (string, error) {
return "", err return "", err
} }
go func() { go func() {
glog.V(4).Infof(log("waiting for volume %s to be mapped/attached", token)) glog.V(4).Info(log("waiting for volume %s to be mapped/attached", token))
}() }()
if path, ok := devMap[token]; ok { if path, ok := devMap[token]; ok {
glog.V(4).Info(log("device %s mapped to vol %s", path, token)) glog.V(4).Info(log("device %s mapped to vol %s", path, token))
...@@ -451,7 +451,7 @@ func (c *sioClient) WaitForDetachedDevice(token string) error { ...@@ -451,7 +451,7 @@ func (c *sioClient) WaitForDetachedDevice(token string) error {
return err return err
} }
go func() { go func() {
glog.V(4).Infof(log("waiting for volume %s to be unmapped/detached", token)) glog.V(4).Info(log("waiting for volume %s to be unmapped/detached", token))
}() }()
// cant find vol id, then ok. // cant find vol id, then ok.
if _, ok := devMap[token]; !ok { if _, ok := devMap[token]; !ok {
......
...@@ -27,7 +27,6 @@ import ( ...@@ -27,7 +27,6 @@ import (
) )
const ( const (
sioName = "scaleio"
sioPluginName = "kubernetes.io/scaleio" sioPluginName = "kubernetes.io/scaleio"
sioConfigFileName = "sioconf.dat" sioConfigFileName = "sioconf.dat"
) )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment