Merge pull request #13984 from zexi/automated-cherry-pick-of-#13981-upstream-master

Automated cherry pick of #13981: fix(region): multi disk created after instance snapshot

pkg/compute/models/instance_snapshot_joint.go

@@ -17,6 +17,8 @@ package models
 import (
 	"context"
 
+	"yunion.io/x/pkg/errors"
+
 	"yunion.io/x/onecloud/pkg/cloudcommon/db"
 	"yunion.io/x/onecloud/pkg/mcclient"
 )
@@ -82,3 +84,11 @@ func (manager *SInstanceSnapshotJointManager) IsSubSnapshot(snapshotId string) (
 func (self *SInstanceSnapshotJoint) Detach(ctx context.Context, userCred mcclient.TokenCredential) error {
 	return db.DetachJoint(ctx, userCred, self)
 }
+
+func (self *SInstanceSnapshotJoint) GetSnapshotDisk() (*SDisk, error) {
+	sp, err := SnapshotManager.FetchById(self.SnapshotId)
+	if err != nil {
+		return nil, errors.Wrapf(err, "Get snapshot by %q", self.SnapshotId)
+	}
+	return sp.(*SSnapshot).GetDisk()
+}

pkg/compute/models/instance_snapshots.go

@@ -682,3 +682,40 @@ func (ism *SInstanceSnapshotManager) InitializeData() error {
 	}
 	return nil
 }
+
+func (isp *SInstanceSnapshot) GetInstanceSnapshotJointsByOrder(guest *SGuest) ([]*SInstanceSnapshotJoint, error) {
+	disks, err := guest.GetGuestDisks()
+	if err != nil {
+		return nil, errors.Wrap(err, "GetGuestDisks")
+	}
+	ss, err := isp.GetSnapshots()
+	if err != nil {
+		return nil, errors.Wrapf(err, "Get %s subsnapshots", isp.GetName())
+	}
+	jIsps := make([]*SInstanceSnapshotJoint, 0)
+	for idx, gd := range disks {
+		d := gd.GetDisk()
+		if d == nil {
+			return nil, errors.Wrapf(err, "Not get guestdisk %d related disk", idx)
+		}
+		if idx >= len(ss) {
+			break
+		}
+		jIsp, err := isp.GetInstanceSnapshotJointAt(idx)
+		if err != nil {
+			return nil, errors.Wrapf(err, "GetInstanceSnapshotJointAt %d", idx)
+		}
+		sd, err := ss[idx].GetDisk()
+		if err != nil {
+			return nil, errors.Wrapf(err, "Get snapshot %d disk", idx)
+		}
+		if ss[idx].GetId() != jIsp.SnapshotId {
+			return nil, errors.Wrapf(err, "InstanceSnapshotJoint %d snapshot_id %q != %q", idx, jIsp.SnapshotId, ss[idx].GetId())
+		}
+		if sd.GetId() != d.GetId() {
+			return nil, errors.Wrapf(err, "Disk Snapshot %d's disk id %q != current disk %q", idx, sd.GetId(), d.GetId())
+		}
+		jIsps = append(jIsps, jIsp)
+	}
+	return jIsps, nil
+}

pkg/compute/regiondrivers/kvm.go

@@ -1065,13 +1065,16 @@ func (self *SKVMRegionDriver) RequestDeleteInstanceBackup(ctx context.Context, i
 }
 
 func (self *SKVMRegionDriver) RequestResetToInstanceSnapshot(ctx context.Context, guest *models.SGuest, isp *models.SInstanceSnapshot, task taskman.ITask, params *jsonutils.JSONDict) error {
-	disks, _ := guest.GetGuestDisks()
+	jIsps, err := isp.GetInstanceSnapshotJointsByOrder(guest)
+	if err != nil {
+		return errors.Wrap(err, "GetInstanceSnapshotJointsByOrder")
+	}
 	diskIndexI64, err := params.Int("disk_index")
 	if err != nil {
 		return errors.Wrap(err, "get 'disk_index' from params")
 	}
 	diskIndex := int(diskIndexI64)
-	if diskIndex >= len(disks) {
+	if diskIndex >= len(jIsps) {
 		task.SetStage("OnInstanceSnapshotReset", nil)
 		withMem := jsonutils.QueryBoolean(params, "with_memory", false)
 		if isp.WithMemory && withMem {
@@ -1097,19 +1100,19 @@ func (self *SKVMRegionDriver) RequestResetToInstanceSnapshot(ctx context.Context
 		return nil
 	}
 
-	isj, err := isp.GetInstanceSnapshotJointAt(diskIndex)
-	if err != nil {
-		return err
-	}
+	isj := jIsps[diskIndex]
 
 	params = jsonutils.NewDict()
 	params.Set("disk_index", jsonutils.NewInt(int64(diskIndex)))
 	task.SetStage("OnKvmDiskReset", params)
 
-	disk := disks[diskIndex].GetDisk()
+	disk, err := isj.GetSnapshotDisk()
+	if err != nil {
+		return errors.Wrapf(err, "Get %d snapshot disk", diskIndex)
+	}
 	err = disk.StartResetDisk(ctx, task.GetUserCred(), isj.SnapshotId, false, guest, task.GetTaskId())
 	if err != nil {
-		return err
+		return errors.Wrap(err, "StartResetDisk")
 	}
 	return nil
 }