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

Merge pull request #56658 from wenjun93/master

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 56480, 56675, 56624, 56648, 56658). 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>.

minor fix error typo of rbd volume teardown

fix typo in rbd volume plugin `diskTearDown`
This commit is contained in:
Kubernetes Submit Queue 2017-12-16 03:24:51 -08:00 committed by GitHub
commit 88ae1ef52b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/volume/rbd/disk_manager.go
View File

@ -115,9 +115,9 @@ func diskTearDown(manager diskManager, c rbdUnmounter, volPath string, mounter m
} }
notMnt, mntErr := mounter.IsLikelyNotMountPoint(volPath) notMnt, mntErr := mounter.IsLikelyNotMountPoint(volPath)
if err != nil && !os.IsNotExist(err) { if mntErr != nil && !os.IsNotExist(mntErr) {
glog.Errorf("IsLikelyNotMountPoint check failed: %v", mntErr) glog.Errorf("IsLikelyNotMountPoint check failed: %v", mntErr)
return err return mntErr
} }
if notMnt { if notMnt {
if err := os.Remove(volPath); err != nil { if err := os.Remove(volPath); err != nil {