fix(region): managed vm migrate info (#21754)

yunionio · Dec 5, 2024 · 713dc19 · 713dc19
1 parent c4c1f1c
commit 713dc19
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/pkg/compute/guestdrivers/managedvirtual.go b/pkg/compute/guestdrivers/managedvirtual.go
@@ -1417,9 +1417,8 @@ func (self *SManagedVirtualizedGuestDriver) requestMigrate(ctx context.Context,
 				return false, nil
 			}
 			hostId := iVM.GetIHostId()
-			log.Debugf("guest %s migrate from %s -> %s", guest.Name, hostExternalId, hostId)
-			if len(hostId) > 0 && hostId != hostExternalId {
-				hostExternalId = hostId
+			log.Debugf("guest %s migrate from %s -> %s", guest.Name, guest.HostId, host.Id)
+			if len(hostId) > 0 && hostId == hostExternalId {
 				return true, nil
 			}
 			return false, nil

diff --git a/pkg/mcclient/cloudpods/instance.go b/pkg/mcclient/cloudpods/instance.go
@@ -357,13 +357,15 @@ func (self *SInstance) DetachDisk(ctx context.Context, diskId string) error {
 func (self *SInstance) MigrateVM(hostId string) error {
 	input := api.GuestMigrateInput{}
 	input.PreferHost = hostId
+	input.PreferHostId = hostId
 	_, err := self.host.zone.region.perform(&modules.Servers, self.Id, "migrate", input)
 	return err
 }
 
 func (self *SInstance) LiveMigrateVM(hostId string) error {
 	input := api.GuestLiveMigrateInput{}
 	input.PreferHost = hostId
+	input.PreferHostId = hostId
 	skipCpuCheck := true
 	input.SkipCpuCheck = &skipCpuCheck
 	_, err := self.host.zone.region.perform(&modules.Servers, self.Id, "live-migrate", input)