From b3f4a034f1b14b326281b832064a105935ebd57c Mon Sep 17 00:00:00 2001 From: andyzhangx Date: Wed, 10 Jul 2019 10:47:45 +0000 Subject: [PATCH] chore: make some func as public in azure provider fix comments --- .../legacy-cloud-providers/azure/azure.go | 4 +- .../azure/azure_backoff.go | 38 +++++++++---------- .../azure/azure_controller_common.go | 2 +- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/staging/src/k8s.io/legacy-cloud-providers/azure/azure.go b/staging/src/k8s.io/legacy-cloud-providers/azure/azure.go index 161aed3621c..0297dfc8309 100644 --- a/staging/src/k8s.io/legacy-cloud-providers/azure/azure.go +++ b/staging/src/k8s.io/legacy-cloud-providers/azure/azure.go @@ -183,7 +183,7 @@ type Cloud struct { DisksClient DisksClient SnapshotsClient *compute.SnapshotsClient FileClient FileClient - resourceRequestBackoff wait.Backoff + ResourceRequestBackoff wait.Backoff metadata *InstanceMetadataService vmSet VMSet @@ -404,7 +404,7 @@ func (az *Cloud) InitializeCloudFromConfig(config *Config, fromSecret bool) erro az.Config = *config az.Environment = *env - az.resourceRequestBackoff = resourceRequestBackoff + az.ResourceRequestBackoff = resourceRequestBackoff az.metadata, err = NewInstanceMetadataService(metadataURL) if err != nil { return err diff --git a/staging/src/k8s.io/legacy-cloud-providers/azure/azure_backoff.go b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_backoff.go index fba0e365b47..6b86259a7ac 100644 --- a/staging/src/k8s.io/legacy-cloud-providers/azure/azure_backoff.go +++ b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_backoff.go @@ -32,13 +32,13 @@ import ( "k8s.io/klog" ) -// requestBackoff if backoff is disabled in cloud provider it +// RequestBackoff if backoff is disabled in cloud provider it // returns a new Backoff object steps = 1 // This is to make sure that the requested command executes // at least once -func (az *Cloud) requestBackoff() (resourceRequestBackoff wait.Backoff) { +func (az *Cloud) RequestBackoff() (resourceRequestBackoff wait.Backoff) { if az.CloudProviderBackoff { - return az.resourceRequestBackoff + return az.ResourceRequestBackoff } resourceRequestBackoff = wait.Backoff{ Steps: 1, @@ -57,7 +57,7 @@ func (az *Cloud) Event(obj runtime.Object, eventtype, reason, message string) { func (az *Cloud) GetVirtualMachineWithRetry(name types.NodeName) (compute.VirtualMachine, error) { var machine compute.VirtualMachine var retryErr error - err := wait.ExponentialBackoff(az.requestBackoff(), func() (bool, error) { + err := wait.ExponentialBackoff(az.RequestBackoff(), func() (bool, error) { machine, retryErr = az.getVirtualMachine(name) if retryErr == cloudprovider.InstanceNotFound { return true, cloudprovider.InstanceNotFound @@ -78,7 +78,7 @@ func (az *Cloud) GetVirtualMachineWithRetry(name types.NodeName) (compute.Virtua // ListVirtualMachinesWithRetry invokes az.VirtualMachinesClient.List with exponential backoff retry func (az *Cloud) ListVirtualMachinesWithRetry(resourceGroup string) ([]compute.VirtualMachine, error) { allNodes := []compute.VirtualMachine{} - err := wait.ExponentialBackoff(az.requestBackoff(), func() (bool, error) { + err := wait.ExponentialBackoff(az.RequestBackoff(), func() (bool, error) { var retryErr error ctx, cancel := getContextWithCancel() defer cancel() @@ -129,7 +129,7 @@ func (az *Cloud) getPrivateIPsForMachine(nodeName types.NodeName) ([]string, err func (az *Cloud) getPrivateIPsForMachineWithRetry(nodeName types.NodeName) ([]string, error) { var privateIPs []string - err := wait.ExponentialBackoff(az.requestBackoff(), func() (bool, error) { + err := wait.ExponentialBackoff(az.RequestBackoff(), func() (bool, error) { var retryErr error privateIPs, retryErr = az.vmSet.GetPrivateIPsByNodeName(string(nodeName)) if retryErr != nil { @@ -153,7 +153,7 @@ func (az *Cloud) getIPForMachine(nodeName types.NodeName) (string, string, error // GetIPForMachineWithRetry invokes az.getIPForMachine with exponential backoff retry func (az *Cloud) GetIPForMachineWithRetry(name types.NodeName) (string, string, error) { var ip, publicIP string - err := wait.ExponentialBackoff(az.requestBackoff(), func() (bool, error) { + err := wait.ExponentialBackoff(az.RequestBackoff(), func() (bool, error) { var retryErr error ip, publicIP, retryErr = az.vmSet.GetIPByNodeName(string(name)) if retryErr != nil { @@ -195,7 +195,7 @@ func (az *Cloud) CreateOrUpdateSecurityGroup(service *v1.Service, sg network.Sec // CreateOrUpdateSGWithRetry invokes az.SecurityGroupsClient.CreateOrUpdate with exponential backoff retry func (az *Cloud) CreateOrUpdateSGWithRetry(service *v1.Service, sg network.SecurityGroup) error { - return wait.ExponentialBackoff(az.requestBackoff(), func() (bool, error) { + return wait.ExponentialBackoff(az.RequestBackoff(), func() (bool, error) { ctx, cancel := getContextWithCancel() defer cancel() @@ -245,7 +245,7 @@ func (az *Cloud) CreateOrUpdateLB(service *v1.Service, lb network.LoadBalancer) // createOrUpdateLBWithRetry invokes az.LoadBalancerClient.CreateOrUpdate with exponential backoff retry func (az *Cloud) createOrUpdateLBWithRetry(service *v1.Service, lb network.LoadBalancer) error { - return wait.ExponentialBackoff(az.requestBackoff(), func() (bool, error) { + return wait.ExponentialBackoff(az.RequestBackoff(), func() (bool, error) { ctx, cancel := getContextWithCancel() defer cancel() @@ -289,7 +289,7 @@ func (az *Cloud) ListLB(service *v1.Service) ([]network.LoadBalancer, error) { func (az *Cloud) listLBWithRetry(service *v1.Service) ([]network.LoadBalancer, error) { var allLBs []network.LoadBalancer - err := wait.ExponentialBackoff(az.requestBackoff(), func() (bool, error) { + err := wait.ExponentialBackoff(az.RequestBackoff(), func() (bool, error) { var retryErr error ctx, cancel := getContextWithCancel() defer cancel() @@ -335,7 +335,7 @@ func (az *Cloud) ListPIP(service *v1.Service, pipResourceGroup string) ([]networ func (az *Cloud) listPIPWithRetry(service *v1.Service, pipResourceGroup string) ([]network.PublicIPAddress, error) { var allPIPs []network.PublicIPAddress - err := wait.ExponentialBackoff(az.requestBackoff(), func() (bool, error) { + err := wait.ExponentialBackoff(az.RequestBackoff(), func() (bool, error) { var retryErr error ctx, cancel := getContextWithCancel() defer cancel() @@ -374,7 +374,7 @@ func (az *Cloud) CreateOrUpdatePIP(service *v1.Service, pipResourceGroup string, // createOrUpdatePIPWithRetry invokes az.PublicIPAddressesClient.CreateOrUpdate with exponential backoff retry func (az *Cloud) createOrUpdatePIPWithRetry(service *v1.Service, pipResourceGroup string, pip network.PublicIPAddress) error { - return wait.ExponentialBackoff(az.requestBackoff(), func() (bool, error) { + return wait.ExponentialBackoff(az.RequestBackoff(), func() (bool, error) { ctx, cancel := getContextWithCancel() defer cancel() @@ -400,7 +400,7 @@ func (az *Cloud) CreateOrUpdateInterface(service *v1.Service, nic network.Interf // createOrUpdateInterfaceWithRetry invokes az.PublicIPAddressesClient.CreateOrUpdate with exponential backoff retry func (az *Cloud) createOrUpdateInterfaceWithRetry(service *v1.Service, nic network.Interface) error { - return wait.ExponentialBackoff(az.requestBackoff(), func() (bool, error) { + return wait.ExponentialBackoff(az.RequestBackoff(), func() (bool, error) { ctx, cancel := getContextWithCancel() defer cancel() @@ -425,7 +425,7 @@ func (az *Cloud) DeletePublicIP(service *v1.Service, pipResourceGroup string, pi // deletePublicIPWithRetry invokes az.PublicIPAddressesClient.Delete with exponential backoff retry func (az *Cloud) deletePublicIPWithRetry(service *v1.Service, pipResourceGroup string, pipName string) error { - return wait.ExponentialBackoff(az.requestBackoff(), func() (bool, error) { + return wait.ExponentialBackoff(az.RequestBackoff(), func() (bool, error) { ctx, cancel := getContextWithCancel() defer cancel() @@ -457,7 +457,7 @@ func (az *Cloud) DeleteLB(service *v1.Service, lbName string) error { // deleteLBWithRetry invokes az.LoadBalancerClient.Delete with exponential backoff retry func (az *Cloud) deleteLBWithRetry(service *v1.Service, lbName string) error { - return wait.ExponentialBackoff(az.requestBackoff(), func() (bool, error) { + return wait.ExponentialBackoff(az.RequestBackoff(), func() (bool, error) { ctx, cancel := getContextWithCancel() defer cancel() @@ -489,7 +489,7 @@ func (az *Cloud) CreateOrUpdateRouteTable(routeTable network.RouteTable) error { // createOrUpdateRouteTableWithRetry invokes az.RouteTablesClient.CreateOrUpdate with exponential backoff retry func (az *Cloud) createOrUpdateRouteTableWithRetry(routeTable network.RouteTable) error { - return wait.ExponentialBackoff(az.requestBackoff(), func() (bool, error) { + return wait.ExponentialBackoff(az.RequestBackoff(), func() (bool, error) { ctx, cancel := getContextWithCancel() defer cancel() @@ -528,7 +528,7 @@ func (az *Cloud) CreateOrUpdateRoute(route network.Route) error { // createOrUpdateRouteWithRetry invokes az.RoutesClient.CreateOrUpdate with exponential backoff retry func (az *Cloud) createOrUpdateRouteWithRetry(route network.Route) error { - return wait.ExponentialBackoff(az.requestBackoff(), func() (bool, error) { + return wait.ExponentialBackoff(az.RequestBackoff(), func() (bool, error) { ctx, cancel := getContextWithCancel() defer cancel() @@ -565,7 +565,7 @@ func (az *Cloud) DeleteRouteWithName(routeName string) error { // deleteRouteWithRetry invokes az.RoutesClient.Delete with exponential backoff retry func (az *Cloud) deleteRouteWithRetry(routeName string) error { - return wait.ExponentialBackoff(az.requestBackoff(), func() (bool, error) { + return wait.ExponentialBackoff(az.RequestBackoff(), func() (bool, error) { ctx, cancel := getContextWithCancel() defer cancel() @@ -577,7 +577,7 @@ func (az *Cloud) deleteRouteWithRetry(routeName string) error { // UpdateVmssVMWithRetry invokes az.VirtualMachineScaleSetVMsClient.Update with exponential backoff retry func (az *Cloud) UpdateVmssVMWithRetry(resourceGroupName string, VMScaleSetName string, instanceID string, parameters compute.VirtualMachineScaleSetVM, source string) error { - return wait.ExponentialBackoff(az.requestBackoff(), func() (bool, error) { + return wait.ExponentialBackoff(az.RequestBackoff(), func() (bool, error) { ctx, cancel := getContextWithCancel() defer cancel() diff --git a/staging/src/k8s.io/legacy-cloud-providers/azure/azure_controller_common.go b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_controller_common.go index 7bad7d72db9..5eaac916402 100644 --- a/staging/src/k8s.io/legacy-cloud-providers/azure/azure_controller_common.go +++ b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_controller_common.go @@ -139,7 +139,7 @@ func (c *controllerCommon) DetachDisk(diskName, diskURI string, nodeName types.N if c.cloud.CloudProviderBackoff && shouldRetryHTTPRequest(resp, err) { klog.V(2).Infof("azureDisk - update backing off: detach disk(%s, %s), err: %v", diskName, diskURI, err) - retryErr := kwait.ExponentialBackoff(c.cloud.requestBackoff(), func() (bool, error) { + retryErr := kwait.ExponentialBackoff(c.cloud.RequestBackoff(), func() (bool, error) { diskOpMutex.LockKey(instanceid) resp, err := vmset.DetachDisk(diskName, diskURI, nodeName) diskOpMutex.UnlockKey(instanceid)