opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-21 14:19:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Automatic merge from release/2.2.0 -> release/2.3.0

Browse Source 
* commit '3fa36d3869bf425ced7b80ab67b9c155e7b8f019':
  imageId不能更改，尝试删除之前的系统盘，第一次删除会失败，第二次一般会成功
This commit is contained in:
邱剑
2018-10-17 21:09:21 +08:00
parent c3ea407b2f 3fa36d3869
commit 154d6afedf
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/util/azure/instance.go
+12 -7
View File
@@ -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
}
}