From 46d1430a4c427df61c8f0ac202bd9eb2c5dade50 Mon Sep 17 00:00:00 2001
From: andyzhangx <xiazhang@microsoft.com>
Date: Thu, 2 Feb 2023 03:03:36 +0000
Subject: [PATCH] chore: remove async mode

---
 pkg/provider/azure_controller_common.go | 27 +------------------------
 1 file changed, 1 insertion(+), 26 deletions(-)

diff --git a/pkg/provider/azure_controller_common.go b/pkg/provider/azure_controller_common.go
index f70693f5c6..128cce8720 100644
--- a/pkg/provider/azure_controller_common.go
+++ b/pkg/provider/azure_controller_common.go
@@ -254,7 +254,6 @@ func (c *controllerCommon) AttachDisk(ctx context.Context, async bool, diskName,
 	diskToAttach := &AttachDiskParams{
 		diskURI: diskURI,
 		options: options,
-		async:   async,
 	}
 
 	resourceGroup, err := c.cloud.GetNodeResourceGroup(string(nodeName))
@@ -283,7 +282,6 @@ func (c *controllerCommon) AttachDisk(ctx context.Context, async bool, diskName,
 type AttachDiskParams struct {
 	diskURI string
 	options *AttachDiskOptions
-	async   bool
 }
 
 func (a *AttachDiskParams) CleanUp() {
@@ -300,7 +298,6 @@ type attachDiskResult struct {
 func (c *controllerCommon) attachDiskBatchToNode(ctx context.Context, subscriptionID, resourceGroup string, nodeName types.NodeName, disksToAttach []*AttachDiskParams) ([]chan (attachDiskResult), error) {
 	diskMap := make(map[string]*AttachDiskOptions, len(disksToAttach))
 	lunChans := make([]chan (attachDiskResult), len(disksToAttach))
-	async := false
 
 	for i, disk := range disksToAttach {
 		lunChans[i] = make(chan (attachDiskResult), 1)
@@ -310,8 +307,6 @@ func (c *controllerCommon) attachDiskBatchToNode(ctx context.Context, subscripti
 		diskURI := strings.ToLower(disk.diskURI)
 		c.diskStateMap.Store(diskURI, "attaching")
 		defer c.diskStateMap.Delete(diskURI)
-
-		async = async || disk.async
 	}
 
 	err := c.cloud.SetDiskLun(nodeName, diskMap)
@@ -345,21 +340,6 @@ func (c *controllerCommon) attachDiskBatchToNode(ctx context.Context, subscripti
 		klog.V(2).Infof("azuredisk - trying to attach disks to node %s, diskMap len:%d, %s", nodeName, len(diskMap), diskMap)
 
 		resultCtx := ctx
-
-		if async {
-			// The context, ctx, passed to attachDiskBatchToNode is owned by batch.Processor which will
-			// cancel it when we return. Since we're asynchronously waiting for the attach disk result,
-			// we must create an independent context passed to WaitForUpdateResult with the deadline
-			// provided in ctx. This avoids an earlier return due to ctx being canceled while still
-			// respecting the deadline for the overall attach operation.
-			resultCtx = context.Background()
-			if deadline, ok := ctx.Deadline(); ok {
-				var cancel func()
-				resultCtx, cancel = context.WithDeadline(resultCtx, deadline)
-				defer cancel()
-			}
-		}
-
 		err = c.waitForUpdateResult(resultCtx, vmset, nodeName, future, err)
 
 		for i, disk := range disksToAttach {
@@ -367,12 +347,7 @@ func (c *controllerCommon) attachDiskBatchToNode(ctx context.Context, subscripti
 		}
 	}
 
-	if async {
-		go attachFn()
-	} else {
-		attachFn()
-	}
-
+	attachFn()
 	return lunChans, nil
 }