diff --git a/pkg/cloudprovider/providers/azure/azure_backoff.go b/pkg/cloudprovider/providers/azure/azure_backoff.go index 7fda4cc78ae..5eb622950eb 100644 --- a/pkg/cloudprovider/providers/azure/azure_backoff.go +++ b/pkg/cloudprovider/providers/azure/azure_backoff.go @@ -57,23 +57,6 @@ func (az *Cloud) GetVirtualMachineWithRetry(name types.NodeName) (compute.Virtua return machine, err } -// VirtualMachineClientGetWithRetry invokes az.VirtualMachinesClient.Get with exponential backoff retry -func (az *Cloud) VirtualMachineClientGetWithRetry(resourceGroup, vmName string, types compute.InstanceViewTypes) (compute.VirtualMachine, error) { - var machine compute.VirtualMachine - err := wait.ExponentialBackoff(az.requestBackoff(), func() (bool, error) { - var retryErr error - az.operationPollRateLimiter.Accept() - machine, retryErr = az.VirtualMachinesClient.Get(resourceGroup, vmName, types) - if retryErr != nil { - glog.Errorf("backoff: failure, will retry,err=%v", retryErr) - return false, nil - } - glog.V(2).Infof("backoff: success") - return true, nil - }) - return machine, err -} - // VirtualMachineClientListWithRetry invokes az.VirtualMachinesClient.List with exponential backoff retry func (az *Cloud) VirtualMachineClientListWithRetry() ([]compute.VirtualMachine, error) { allNodes := []compute.VirtualMachine{} diff --git a/pkg/cloudprovider/providers/azure/azure_util.go b/pkg/cloudprovider/providers/azure/azure_util.go index d0b062846d6..c7fcef10ebd 100644 --- a/pkg/cloudprovider/providers/azure/azure_util.go +++ b/pkg/cloudprovider/providers/azure/azure_util.go @@ -564,13 +564,11 @@ func (as *availabilitySet) GetPrimaryInterface(nodeName, vmSetName string) (netw var machine compute.VirtualMachine as.operationPollRateLimiter.Accept() - glog.V(10).Infof("VirtualMachinesClient.Get(%q): start", nodeName) - machine, err := as.VirtualMachineClientGetWithRetry(as.ResourceGroup, nodeName, "") + machine, err := as.GetVirtualMachineWithRetry(types.NodeName(nodeName)) if err != nil { glog.V(2).Infof("GetPrimaryInterface(%s, %s) abort backoff", nodeName, vmSetName) return network.Interface{}, err } - glog.V(10).Infof("VirtualMachinesClient.Get(%q): end", nodeName) primaryNicID, err := getPrimaryInterfaceID(machine) if err != nil {