Skip to content

Commit 739d2bd

Browse files
committed
Revert "Merge release branch 4.20 to main"
This reverts commit fadb39e, reversing changes made to d1cf453.
1 parent 60b645f commit 739d2bd

File tree

1 file changed

+17
-0
lines changed

1 file changed

+17
-0
lines changed

server/src/main/java/com/cloud/ha/HighAvailabilityManagerImpl.java

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -345,6 +345,23 @@ public boolean scheduleMigration(final VMInstanceVO vm) {
345345
logger.info("Scheduled migration work of VM " + vm.getUuid() + " from host " + _hostDao.findById(vm.getHostId()) + " with HAWork " + work);
346346
wakeupWorkers();
347347
}
348+
<<<<<<< HEAD
349+
=======
350+
351+
if (!VmHaEnabled.valueIn(vm.getDataCenterId())) {
352+
String message = String.format("Unable to schedule migration for the VM %s (%d) on host %d, VM high availability manager is disabled.", vm.getName(), vm.getId(), vm.getHostId());
353+
if (logger.isDebugEnabled()) {
354+
logger.debug(message);
355+
}
356+
sendVMAlert(vm, message);
357+
return false;
358+
}
359+
360+
final HaWorkVO work = new HaWorkVO(vm.getId(), vm.getType(), WorkType.Migration, Step.Scheduled, vm.getHostId(), vm.getState(), 0, vm.getUpdated());
361+
_haDao.persist(work);
362+
logger.info("Scheduled migration work of VM " + vm.getUuid() + " from host " + _hostDao.findById(vm.getHostId()) + " with HAWork " + work);
363+
wakeupWorkers();
364+
>>>>>>> parent of fadb39ece7 (Merge release branch 4.20 to main)
348365
return true;
349366
}
350367

0 commit comments

Comments
 (0)