github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-08 11:38:15 +00:00
Code Issues Projects Releases Wiki Activity

fix ci problems

Browse Source
This commit is contained in:
edisonxiang 2017-11-20 12:51:39 +08:00
parent 3652474ee1
commit 1886de8357
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/volume/cinder/attacher.go
View File

@ -230,7 +230,7 @@ func (attacher *cinderDiskAttacher) waitProbeVolume(devicePath, volumeID string)
Steps: probeVolumeSteps, Steps: probeVolumeSteps,
} }
err := wait.ExponentialBackoff(backoff, func() (string, error) { err := wait.ExponentialBackoff(backoff, func() (bool, error) {
glog.V(5).Infof("Checking Cinder disk %q is attached.", volumeID) glog.V(5).Infof("Checking Cinder disk %q is attached.", volumeID)
probeAttachedVolume() probeAttachedVolume()
if !attacher.cinderProvider.ShouldTrustDevicePath() { if !attacher.cinderProvider.ShouldTrustDevicePath() {
@ -240,18 +240,22 @@ func (attacher *cinderDiskAttacher) waitProbeVolume(devicePath, volumeID string)
exists, err := volumeutil.PathExists(devicePath) exists, err := volumeutil.PathExists(devicePath)
if exists && err == nil { if exists && err == nil {
glog.Infof("Successfully found attached Cinder disk %q at %v.", volumeID, devicePath) glog.Infof("Successfully found attached Cinder disk %q at %v.", volumeID, devicePath)
return devicePath, nil return true, nil
} else { } else {
// Log an error, and continue checking periodically // Log an error, and continue checking periodically
glog.Errorf("Error: could not find attached Cinder disk %q (path: %q): %v", volumeID, devicePath, err) glog.Errorf("Error: could not find attached Cinder disk %q (path: %q): %v", volumeID, devicePath, err)
return false, nil
} }
}) })
if err == wait.ErrWaitTimeout { if err != nil {
err = fmt.Errorf("Volume %q failed to be probed within the alloted time", volumeID) if err == wait.ErrWaitTimeout {
err = fmt.Errorf("Volume %q failed to be probed within the alloted time", volumeID)
}
return "", err
} }
return "", err return devicePath, nil
} }
func (attacher *cinderDiskAttacher) WaitForAttach(spec *volume.Spec, devicePath string, _ *v1.Pod, timeout time.Duration) (string, error) { func (attacher *cinderDiskAttacher) WaitForAttach(spec *volume.Spec, devicePath string, _ *v1.Pod, timeout time.Duration) (string, error) {