Merge pull request #87959 from andyzhangx/non-retriable

add StatusConflict(409) as non-retriable error for disksClient
This commit is contained in:
Kubernetes Prow Robot 2020-02-09 11:24:05 -08:00 committed by GitHub
commit acd97b42f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -518,7 +518,7 @@ func (az *Cloud) InitializeCloudFromConfig(config *Config, fromSecret bool) erro
az.VirtualMachineScaleSetVMsClient = vmssvmclient.New(vmssVMClientConfig)
disksClientConfig := azClientConfig.WithRateLimiter(config.DiskRateLimit)
disksClientConfig.Backoff = disksClientConfig.Backoff.WithNonRetriableErrors([]string{}, []int{http.StatusNotFound})
disksClientConfig.Backoff = disksClientConfig.Backoff.WithNonRetriableErrors([]string{}, []int{http.StatusNotFound, http.StatusConflict})
az.DisksClient = diskclient.New(disksClientConfig)
if az.MaximumLoadBalancerRuleCount == 0 {