From f76df16a0f7d257fa88b3f6bbee59f34f0ca4824 Mon Sep 17 00:00:00 2001 From: ioito Date: Mon, 30 May 2022 16:02:17 +0800 Subject: [PATCH] fix(region): aliyun disk external id --- pkg/compute/guestdrivers/managedvirtual.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkg/compute/guestdrivers/managedvirtual.go b/pkg/compute/guestdrivers/managedvirtual.go index 65b02b447a..7a49e02b7e 100644 --- a/pkg/compute/guestdrivers/managedvirtual.go +++ b/pkg/compute/guestdrivers/managedvirtual.go @@ -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