github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Return actual error when backoff fails

pull/6/head
Dong Liu 2018-01-04 11:46:29 +08:00
parent 71d3cffd1f
commit 1836e567a9
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/cloudprovider/providers/azure/azure_backoff.go
View File

@ -44,8 +44,8 @@ func (az *Cloud) requestBackoff() (resourceRequestBackoff wait.Backoff) {
// GetVirtualMachineWithRetry invokes az.getVirtualMachine with exponential backoff retry // GetVirtualMachineWithRetry invokes az.getVirtualMachine with exponential backoff retry
func (az *Cloud) GetVirtualMachineWithRetry(name types.NodeName) (compute.VirtualMachine, error) { func (az *Cloud) GetVirtualMachineWithRetry(name types.NodeName) (compute.VirtualMachine, error) {
var machine compute.VirtualMachine var machine compute.VirtualMachine
var retryErr error
err := wait.ExponentialBackoff(az.requestBackoff(), func() (bool, error) { err := wait.ExponentialBackoff(az.requestBackoff(), func() (bool, error) {
var retryErr error
machine, retryErr = az.getVirtualMachine(name) machine, retryErr = az.getVirtualMachine(name)
if retryErr != nil { if retryErr != nil {
glog.Errorf("backoff: failure, will retry,err=%v", retryErr) glog.Errorf("backoff: failure, will retry,err=%v", retryErr)
@ -54,6 +54,10 @@ func (az *Cloud) GetVirtualMachineWithRetry(name types.NodeName) (compute.Virtua
glog.V(2).Infof("backoff: success") glog.V(2).Infof("backoff: success")
return true, nil return true, nil
}) })
if err == wait.ErrWaitTimeout {
err = retryErr
}
return machine, err return machine, err
} }