From 7a5c4c990e5b038db38ffc52aac3b37f90673464 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B1=88=E8=BD=A9?= <quxuan@yunionyun.com>
Date: Wed, 17 Oct 2018 18:41:09 +0800
Subject: [PATCH] =?UTF-8?q?imageId=E4=B8=8D=E8=83=BD=E6=9B=B4=E6=94=B9?=
 =?UTF-8?q?=EF=BC=8C=E5=B0=9D=E8=AF=95=E5=88=A0=E9=99=A4=E4=B9=8B=E5=89=8D?=
 =?UTF-8?q?=E7=9A=84=E7=B3=BB=E7=BB=9F=E7=9B=98=EF=BC=8C=E7=AC=AC=E4=B8=80?=
 =?UTF-8?q?=E6=AC=A1=E5=88=A0=E9=99=A4=E4=BC=9A=E5=A4=B1=E8=B4=A5=EF=BC=8C?=
 =?UTF-8?q?=E7=AC=AC=E4=BA=8C=E6=AC=A1=E4=B8=80=E8=88=AC=E4=BC=9A=E6=88=90?=
 =?UTF-8?q?=E5=8A=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg/util/azure/instance.go | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/pkg/util/azure/instance.go b/pkg/util/azure/instance.go
index a810d1ea73..1bfa396d5a 100644
--- a/pkg/util/azure/instance.go
+++ b/pkg/util/azure/instance.go
@@ -351,7 +351,7 @@ func (region *SRegion) UpdateInstance(instanceId string, params compute.VirtualM
 	computeClient := compute.NewVirtualMachinesClientWithBaseURI(region.client.baseUrl, region.client.subscriptionId)
 	computeClient.Authorizer = region.client.authorizer
 	_, resourceGroup, instanceName := pareResourceGroupWithName(instanceId, INSTANCE_RESOURCE)
-	log.Errorf("update VM: %s", jsonutils.Marshal(params).PrettyString())
+	log.Debugf("update VM: %s", jsonutils.Marshal(params).String())
 	if _, err := computeClient.Update(context.Background(), resourceGroup, instanceName, params); err != nil {
 		return err
 	}
@@ -560,7 +560,7 @@ func (region *SRegion) ReplaceSystemDisk(instanceId, imageId, passwd, publicKey
 		}
 		diskName := fmt.Sprintf("vdisk_%s_%d", instance.Name, time.Now().UnixNano())
 		storageType := string(instance.Properties.StorageProfile.OsDisk.ManagedDisk.StorageAccountType)
-		//oldDiskId := instance.Properties.StorageProfile.OsDisk.ManagedDisk.ID
+		oldDiskId := instance.Properties.StorageProfile.OsDisk.ManagedDisk.ID
 		if diskId, err := region.createDisk(storageType, diskName, sysSizeGB, "", imageId); err != nil {
 			return "", err
 		} else {
@@ -570,7 +570,7 @@ func (region *SRegion) ReplaceSystemDisk(instanceId, imageId, passwd, publicKey
 			params := compute.VirtualMachineUpdate{
 				VirtualMachineProperties: &compute.VirtualMachineProperties{
 					StorageProfile: &compute.StorageProfile{
-						ImageReference: &compute.ImageReference{ID: &image.ID},
+						//ImageReference: &compute.ImageReference{ID: &image.ID},
 						OsDisk: &compute.OSDisk{
 							Name: &disk.Name,
 							ManagedDisk: &compute.ManagedDiskParameters{
@@ -579,7 +579,7 @@ func (region *SRegion) ReplaceSystemDisk(instanceId, imageId, passwd, publicKey
 							},
 							CreateOption: compute.DiskCreateOptionTypesFromImage,
 							OsType:       osType,
-							DiskSizeGB:   &sysSizeGB,
+							//DiskSizeGB:   &sysSizeGB,
 						},
 					},
 					OsProfile: &compute.OSProfile{
@@ -596,9 +596,14 @@ func (region *SRegion) ReplaceSystemDisk(instanceId, imageId, passwd, publicKey
 				region.deleteDisk(diskId)
 				return "", err
 			}
-			// if err := region.deleteDisk(oldDiskId); err != nil {
-			// 	return "", err
-			// }
+			for i := 0; i < 3; i++ {
+				log.Debugf("try delete old disk: %s", oldDiskId)
+				if err := region.deleteDisk(oldDiskId); err == nil {
+					break
+				}
+				time.Sleep(time.Second * time.Duration(i*10))
+			}
+
 			return disk.ID, nil
 		}
 	}