github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-31 15:25:57 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #60611 from linyouchong/linyouchong-20180228

Browse Source 
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
This commit is contained in:
Kubernetes Submit Queue 2018-03-20 04:34:35 -07:00 committed by GitHub
commit 7887fba3a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/volume/scaleio/sio_client.go
View File

@ -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 {
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 {

1
pkg/volume/scaleio/sio_plugin.go
View File

@ -27,7 +27,6 @@ import (
) )
const ( const (
sioName = "scaleio"
sioPluginName = "kubernetes.io/scaleio" sioPluginName = "kubernetes.io/scaleio"
sioConfigFileName = "sioconf.dat" sioConfigFileName = "sioconf.dat"
) )