From 5bcbecf5bb0bed479f7db8effe560b158353483d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B1=88=E8=BD=A9?= Date: Thu, 5 Dec 2024 19:33:21 +0800 Subject: [PATCH] fix(region): managed vm migrate info (#21756) --- 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 37c5ad2370..b9ae89c3c7 100644 --- a/pkg/compute/guestdrivers/managedvirtual.go +++ b/pkg/compute/guestdrivers/managedvirtual.go @@ -1375,9 +1375,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 3d16ef65ce..d1cd628dc7 100644 --- a/pkg/mcclient/cloudpods/instance.go +++ b/pkg/mcclient/cloudpods/instance.go @@ -353,6 +353,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 } @@ -360,6 +361,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)