opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14351 from ioito/hotfix/qx-aliyun-disk

Browse Source 
fix(region): aliyun disk external id
This commit is contained in:
Zexi Li
2022-05-30 23:43:00 +08:00
committed by GitHub
parent 6caa9389af f76df16a0f
commit de8c8495c8
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/guestdrivers/managedvirtual.go
+3 -4
View File
@@ -996,11 +996,10 @@ func (self *SManagedVirtualizedGuestDriver) OnGuestDeployTaskDataReceived(ctx co
disks, _ := guest.GetGuestDisks()
if len(disks) != len(diskInfo) {
msg := fmt.Sprintf("inconsistent disk number: guest have %d disks, data contains %d disks", len(disks), len(diskInfo))
log.Errorf(msg)
return fmt.Errorf(msg)
// 公有云镜像可能包含数据盘, 若忽略设置磁盘的external id, 会导致部分磁盘状态异常
log.Warningf("inconsistent disk number: guest have %d disks, data contains %d disks", len(disks), len(diskInfo))
}
for i := 0; i < len(diskInfo); i += 1 {
for i := 0; i < len(diskInfo) && i < len(disks); i += 1 {
disk := disks[i].GetDisk()
_, err = db.Update(disk, func() error {
disk.DiskSize = diskInfo[i].Size