github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 06:27:05 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #80612 from AllenZMC/patch-1

Browse Source 
fix typos in csi_attacher.go
This commit is contained in:
Kubernetes Prow Robot 2019-07-30 10:09:18 -07:00 committed by GitHub
commit dcf1eff767
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -343,7 +343,7 @@ func (c *csiAttacher) MountDevice(spec *volume.Spec, devicePath string, deviceMo
// clean up metadata // clean up metadata
klog.Errorf(log("attacher.MountDevice failed: %v", err)) klog.Errorf(log("attacher.MountDevice failed: %v", err))
if err := removeMountDir(c.plugin, deviceMountPath); err != nil { if err := removeMountDir(c.plugin, deviceMountPath); err != nil {
klog.Error(log("attacher.MountDevice failed to remove mount dir after errir [%s]: %v", deviceMountPath, err)) klog.Error(log("attacher.MountDevice failed to remove mount dir after error [%s]: %v", deviceMountPath, err))
} }
} }
}() }()
@ -584,7 +584,7 @@ func (c *csiAttacher) UnmountDevice(deviceMountPath string) error {
klog.Infof(log("attacher.UnmountDevice STAGE_UNSTAGE_VOLUME capability not set. Skipping UnmountDevice...")) klog.Infof(log("attacher.UnmountDevice STAGE_UNSTAGE_VOLUME capability not set. Skipping UnmountDevice..."))
// Just delete the global directory + json file // Just delete the global directory + json file
if err := removeMountDir(c.plugin, deviceMountPath); err != nil { if err := removeMountDir(c.plugin, deviceMountPath); err != nil {
return fmt.Errorf("failed to clean up gloubal mount %s: %s", dataDir, err) return fmt.Errorf("failed to clean up global mount %s: %s", dataDir, err)
} }
return nil return nil
@ -602,7 +602,7 @@ func (c *csiAttacher) UnmountDevice(deviceMountPath string) error {
// Delete the global directory + json file // Delete the global directory + json file
if err := removeMountDir(c.plugin, deviceMountPath); err != nil { if err := removeMountDir(c.plugin, deviceMountPath); err != nil {
return fmt.Errorf("failed to clean up gloubal mount %s: %s", dataDir, err) return fmt.Errorf("failed to clean up global mount %s: %s", dataDir, err)
} }
klog.V(4).Infof(log("attacher.UnmountDevice successfully requested NodeStageVolume [%s]", deviceMountPath)) klog.V(4).Infof(log("attacher.UnmountDevice successfully requested NodeStageVolume [%s]", deviceMountPath))