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

Ensure cloudprovider.InstanceNotFound is reported when the VM is not found on Azure

Browse Source
This commit is contained in:
Pengfei Ni 2018-03-22 16:46:04 +08:00
parent 1365ce3419
commit bace00689b
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,6 +28,7 @@ import (
"k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/util/wait"
"k8s.io/kubernetes/pkg/cloudprovider"
) )
// requestBackoff if backoff is disabled in cloud provider it // requestBackoff if backoff is disabled in cloud provider it
@ -51,6 +52,9 @@ func (az *Cloud) GetVirtualMachineWithRetry(name types.NodeName) (compute.Virtua
var retryErr error var retryErr error
err := wait.ExponentialBackoff(az.requestBackoff(), func() (bool, error) { err := wait.ExponentialBackoff(az.requestBackoff(), func() (bool, error) {
machine, retryErr = az.getVirtualMachine(name) machine, retryErr = az.getVirtualMachine(name)
if retryErr == cloudprovider.InstanceNotFound {
return true, cloudprovider.InstanceNotFound
}
if retryErr != nil { if retryErr != nil {
glog.Errorf("backoff: failure, will retry,err=%v", retryErr) glog.Errorf("backoff: failure, will retry,err=%v", retryErr)
return false, nil return false, nil

3
pkg/cloudprovider/providers/azure/azure_standard.go
View File

@ -366,6 +366,9 @@ func (as *availabilitySet) GetInstanceIDByNodeName(name string) (string, error)
var err error var err error
machine, err = as.getVirtualMachine(types.NodeName(name)) machine, err = as.getVirtualMachine(types.NodeName(name))
if err == cloudprovider.InstanceNotFound {
return "", cloudprovider.InstanceNotFound
}
if err != nil { if err != nil {
if as.CloudProviderBackoff { if as.CloudProviderBackoff {
glog.V(2).Infof("InstanceID(%s) backing off", name) glog.V(2).Infof("InstanceID(%s) backing off", name)