Make scalesetvms delete async #3799
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,42 +18,27 @@ package scalesetvms | |
|
|
||
| import ( | ||
| "context" | ||
|
|
||
| "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-11-01/compute" | ||
| "github.com/Azure/go-autorest/autorest" | ||
| azureautorest "github.com/Azure/go-autorest/autorest/azure" | ||
| "k8s.io/utils/ptr" | ||
| "sigs.k8s.io/cluster-api-provider-azure/azure" | ||
| "sigs.k8s.io/cluster-api-provider-azure/util/reconciler" | ||
| "sigs.k8s.io/cluster-api-provider-azure/util/tele" | ||
| ) | ||
|
|
||
| // client wraps go-sdk. | ||
| type client interface { | ||
| Get(context.Context, azure.ResourceSpecGetter) (interface{}, error) | ||
| DeleteAsync(context.Context, azure.ResourceSpecGetter) (azureautorest.FutureAPI, error) | ||
| IsDone(ctx context.Context, future azureautorest.FutureAPI) (isDone bool, err error) | ||
| } | ||
|
|
||
| // azureClient contains the Azure go-sdk Client. | ||
| type azureClient struct { | ||
| scalesetvms compute.VirtualMachineScaleSetVMsClient | ||
| } | ||
|
|
||
| var _ client = &azureClient{} | ||
|
|
||
|
|
@@ -74,79 +59,56 @@ func newVirtualMachineScaleSetVMsClient(subscriptionID string, baseURI string, a | |
| } | ||
|
|
||
| // Get retrieves the Virtual Machine Scale Set Virtual Machine. | ||
| func (ac *azureClient) Get(ctx context.Context, spec azure.ResourceSpecGetter) (interface{}, error) { | ||
| ctx, _, done := tele.StartSpanWithLogger(ctx, "scalesetvms.azureClient.Get") | ||
| defer done() | ||
|
|
||
| return ac.scalesetvms.Get(ctx, spec.ResourceGroupName(), spec.OwnerResourceName(), spec.ResourceName(), "") | ||
| } | ||
|
|
||
| // CreateOrUpdateAsync is a dummy implementation to fulfill the async.Reconciler interface. | ||
|
Contributor
There was a problem hiding this comment. you shouldn't need to do this, you should be able to do check out the disks client for a similar example
Contributor
Author
There was a problem hiding this comment. If I understand correctly, in the disks service we don't attempt to call
Contributor
There was a problem hiding this comment. Now that I'm thinking about this more, I wonder if it might make more sense to add a
Contributor
Author
There was a problem hiding this comment. My thinking was to be able to take advantage of the error handling in this block of
Contributor
There was a problem hiding this comment. @mboersma what do you think? I'm concerned this won't work the same way with the async poller framework when we try to migrade scaleset vms to sdk v2
Contributor
There was a problem hiding this comment. Actually, I think this will act the same way in |
||
| func (ac *azureClient) CreateOrUpdateAsync(ctx context.Context, spec azure.ResourceSpecGetter, parameters interface{}) (result interface{}, future azureautorest.FutureAPI, err error) { | ||
|
CecileRobertMichon marked this conversation as resolved.
|
||
| _, _, done := tele.StartSpanWithLogger(ctx, "scalesets.AzureClient.CreateOrUpdateAsync") | ||
| defer done() | ||
|
|
||
| return nil, nil, nil | ||
| } | ||
|
|
||
| // DeleteAsync deletes a virtual machine scale set instance asynchronously. DeleteAsync sends a DELETE | ||
| // request to Azure and if accepted without error, the func will return a Future which can be used to track the ongoing | ||
| // progress of the operation. | ||
| func (ac *azureClient) DeleteAsync(ctx context.Context, spec azure.ResourceSpecGetter) (future azureautorest.FutureAPI, err error) { | ||
| ctx, _, done := tele.StartSpanWithLogger(ctx, "scalesetvms.AzureClient.DeleteAsync") | ||
| defer done() | ||
|
|
||
| deleteFuture, err := ac.scalesetvms.Delete(ctx, spec.ResourceGroupName(), spec.OwnerResourceName(), spec.ResourceName(), ptr.To(false)) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| ctx, cancel := context.WithTimeout(ctx, reconciler.DefaultAzureCallTimeout) | ||
| defer cancel() | ||
|
|
||
| err = deleteFuture.WaitForCompletionRef(ctx, ac.scalesetvms.Client) | ||
| if err != nil { | ||
| // if an error occurs, return the future. | ||
| // this means the long-running operation didn't finish in the specified timeout. | ||
| return &deleteFuture, err | ||
| } | ||
| _, err = deleteFuture.Result(ac.scalesetvms) | ||
| // if the operation completed, return a nil future. | ||
| return nil, err | ||
| } | ||
|
|
||
| // Result fetches the result of a long-running operation future. | ||
| func (ac *azureClient) Result(ctx context.Context, future azureautorest.FutureAPI, futureType string) (result interface{}, err error) { | ||
| return nil, nil | ||
| } | ||
|
|
||
| // IsDone returns true if the long-running operation has completed. | ||
| func (ac *azureClient) IsDone(ctx context.Context, future azureautorest.FutureAPI) (bool, error) { | ||
| ctx, _, done := tele.StartSpanWithLogger(ctx, "scalesetvms.AzureClient.IsDone") | ||
| defer done() | ||
|
|
||
| return future.DoneWithContext(ctx, ac.scalesetvms) | ||
| } | ||
Uh oh!
There was an error while loading. Please reload this page.