From 713dc191e5be083054c525e56ffeb76685f4078b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B1=88=E8=BD=A9?= Date: Thu, 5 Dec 2024 19:28:41 +0800 Subject: [PATCH] fix(region): managed vm migrate info (#21754) --- pkg/compute/guestdrivers/managedvirtual.go | 5 ++--- pkg/mcclient/cloudpods/instance.go | 2 ++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkg/compute/guestdrivers/managedvirtual.go b/pkg/compute/guestdrivers/managedvirtual.go index be2784d67e..0a336fddcb 100644 --- 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 index 3c61e0c8a4..66f79674e2 100644 --- a/pkg/mcclient/cloudpods/instance.go +++ b/pkg/mcclient/cloudpods/instance.go @@ -357,6 +357,7 @@ 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 } @@ -364,6 +365,7 @@ func (self *SInstance) MigrateVM(hostId string) error { 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)