Merge pull request #11241 from zexi/automated-cherry-pick-of-#11240-upstream-release-3.7

Automated cherry pick of #11240: fix(region): migrate use rescue mode
This commit is contained in:
Zexi Li
2021-05-27 19:43:32 +08:00
committed by GitHub
+3 -3
View File
@@ -394,12 +394,12 @@ func (self *SGuest) validateMigrate(
if !self.GetDriver().IsSupportMigrate() {
return httperrors.NewNotAcceptableError("Not allow for hypervisor %s", self.GetHypervisor())
}
if !migrateInput.IsRescueMode && self.Status != api.VM_READY {
return httperrors.NewServerStatusError("Cannot normal migrate guest in status %s, try rescue mode or server-live-migrate?", self.Status)
}
if err := self.GetDriver().CheckMigrate(self, userCred, *migrateInput); err != nil {
return err
}
if self.Status != api.VM_READY {
return httperrors.NewServerStatusError("Cannot normal migrate guest in status %s, try rescue mode or server-live-migrate?", self.Status)
}
if len(migrateInput.PreferHost) > 0 {
iHost, _ := HostManager.FetchByIdOrName(userCred, migrateInput.PreferHost)
if iHost == nil {