fix(region): sync managed vm status (#21750)

yunionio · Dec 5, 2024 · c4c1f1c · c4c1f1c
1 parent 460e1e5
commit c4c1f1c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/pkg/compute/guestdrivers/managedvirtual.go b/pkg/compute/guestdrivers/managedvirtual.go
@@ -1409,13 +1409,15 @@ func (self *SManagedVirtualizedGuestDriver) requestMigrate(ctx context.Context,
 				return false, err
 			}
 			vmStatus := iVM.GetStatus()
+			log.Debugf("vm %s migrate status: %s", guest.Name, vmStatus)
 			if vmStatus == api.VM_UNKNOWN || strings.Contains(vmStatus, "fail") {
 				return false, errors.Wrapf(cloudprovider.ErrInvalidStatus, vmStatus)
 			}
 			if !utils.IsInStringArray(vmStatus, []string{api.VM_RUNNING, api.VM_READY}) {
 				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
 				return true, nil

diff --git a/pkg/compute/tasks/guest_syncstatus_task.go b/pkg/compute/tasks/guest_syncstatus_task.go
@@ -91,7 +91,7 @@ func (self *GuestSyncstatusTask) OnGetStatusComplete(ctx context.Context, obj db
 		// not change migrating when:
 		//   guest.Status is migrating and task not has parent task
 		os := self.getOriginStatus()
-		if os == api.VM_MIGRATING && statusStr == api.VM_RUNNING {
+		if os == api.VM_MIGRATING && statusStr == api.VM_RUNNING && len(guest.ExternalId) == 0 {
 			statusStr = os
 		}
 	}