Skip to content

Commit

Permalink
Merge pull request kubernetes#65277 from louyihua/automated-cherry-pi…
Browse files Browse the repository at this point in the history
…ck-of-#64588-upstream-release-1.9

Automatic merge from submit-queue.

Automated cherry pick of kubernetes#64588: Fix some log issues in flexvolume

Cherry pick of kubernetes#64588 on release-1.9.

kubernetes#64588: Fix some log issues in flexvolume
  • Loading branch information
Kubernetes Submit Queue authored Jul 31, 2018
2 parents 284c008 + ad0d6c6 commit b3fd5e4
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions pkg/volume/flexvolume/attacher-defaults.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@ type attacherDefaults flexVolumeAttacher

// Attach is part of the volume.Attacher interface
func (a *attacherDefaults) Attach(spec *volume.Spec, hostName types.NodeName) (string, error) {
glog.Warning(logPrefix(a.plugin.flexVolumePlugin), "using default Attach for volume ", spec.Name, ", host ", hostName)
glog.Warning(logPrefix(a.plugin.flexVolumePlugin), "using default Attach for volume ", spec.Name(), ", host ", hostName)
return "", nil
}

// WaitForAttach is part of the volume.Attacher interface
func (a *attacherDefaults) WaitForAttach(spec *volume.Spec, devicePath string, timeout time.Duration) (string, error) {
glog.Warning(logPrefix(a.plugin.flexVolumePlugin), "using default WaitForAttach for volume ", spec.Name, ", device ", devicePath)
glog.Warning(logPrefix(a.plugin.flexVolumePlugin), "using default WaitForAttach for volume ", spec.Name(), ", device ", devicePath)
return devicePath, nil
}

Expand All @@ -47,7 +47,7 @@ func (a *attacherDefaults) GetDeviceMountPath(spec *volume.Spec, mountsDir strin

// MountDevice is part of the volume.Attacher interface
func (a *attacherDefaults) MountDevice(spec *volume.Spec, devicePath string, deviceMountPath string, mounter mount.Interface) error {
glog.Warning(logPrefix(a.plugin.flexVolumePlugin), "using default MountDevice for volume ", spec.Name, ", device ", devicePath, ", deviceMountPath ", deviceMountPath)
glog.Warning(logPrefix(a.plugin.flexVolumePlugin), "using default MountDevice for volume ", spec.Name(), ", device ", devicePath, ", deviceMountPath ", deviceMountPath)
volSource, readOnly := getVolumeSource(spec)

options := make([]string, 0)
Expand Down

0 comments on commit b3fd5e4

Please sign in to comment.