Skip to content

Update in force.ha value configuration value obtention #13391

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
erikbocks wants to merge 2 commits into
base: 4.20
Choose a base branch
from
+10 −7
Open

Update in force.ha value configuration value obtention #13391

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee440f4
Update in force.ha value configuration value obtention
erikbocks Jun 10, 2026
7463667
Remove trailing space
erikbocks Jun 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4936,8 +4936,9 @@ private void handlePowerOffReportWithNoPendingJobsOnVM(final VMInstanceVO vm) {
EventTypes.EVENT_VM_STOP, "Out of band VM power off", vm.getId(), getApiCommandResourceTypeForVm(vm).toString());
case Migrating:
logger.info("VM {} is at {} and we received a {} report while there is no pending jobs on it"
, vm, vm.getState(), vm.getPowerState());
if((HighAvailabilityManager.ForceHA.value() || vm.isHaEnabled()) && vm.getState() == State.Running
, vm.getInstanceName(), vm.getState(), vm.getPowerState());
Pair<Long, Long> clusterHostPair = findClusterAndHostIdForVm(vm, false);
if ((HighAvailabilityManager.ForceHA.valueIn(clusterHostPair.first()) || vm.isHaEnabled()) && vm.getState() == State.Running
&& HaVmRestartHostUp.value()
&& vm.getHypervisorType() != HypervisorType.VMware
&& vm.getHypervisorType() != HypervisorType.Hyperv) {
Expand Down
7 changes: 5 additions & 2 deletions server/src/main/java/com/cloud/ha/HighAvailabilityManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import javax.inject.Inject;
import javax.naming.ConfigurationException;

import com.cloud.utils.Pair;
import org.apache.cloudstack.api.ApiCommandResourceType;
import org.apache.cloudstack.context.CallContext;
import org.apache.cloudstack.engine.orchestration.service.VolumeOrchestrationService;
Expand Down Expand Up @@ -479,7 +480,9 @@ public void scheduleRestart(VMInstanceVO vm, boolean investigate, ReasonType rea
alertType = AlertManager.AlertType.ALERT_TYPE_SSVM;
}

if (!(ForceHA.value() || vm.isHaEnabled())) {

Pair<Long, Long> clusterHostPair = _itMgr.findClusterAndHostIdForVm(vm, false);
if (!(ForceHA.valueIn(clusterHostPair.first()) || vm.isHaEnabled())) {
String hostDesc = "id:" + vm.getHostId() + ", availability zone id:" + vm.getDataCenterId() + ", pod id:" + vm.getPodIdToDeployIn();
_alertMgr.sendAlert(alertType, vm.getDataCenterId(), vm.getPodIdToDeployIn(), "VM (name: " + vm.getHostName() + ", id: " + vm.getId() +
") stopped unexpectedly on host " + hostDesc, "Virtual Machine " + vm.getHostName() + " (id: " + vm.getId() + ") running on host [" + vm.getHostId() +
Expand Down Expand Up @@ -722,7 +725,7 @@ protected Long restart(final HaWorkVO work) {

vm = _itMgr.findById(vm.getId());

if (!ForceHA.value() && !vm.isHaEnabled()) {
if (!ForceHA.valueIn(host.getClusterId()) && !vm.isHaEnabled()) {
if (logger.isDebugEnabled()) {
logger.debug("VM is not HA enabled so we're done.");
}
Expand Down
5 changes: 2 additions & 3 deletions server/src/main/java/com/cloud/resource/ResourceManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -946,7 +946,6 @@ public void doInTransactionWithoutResult(final TransactionStatus status) {

host.setGuid(null);
final Long clusterId = host.getClusterId();
host.setClusterId(null);
_hostDao.update(host.getId(), host);

Host hostRemoved = _hostDao.findById(hostId);
Expand Down Expand Up @@ -2852,7 +2851,7 @@ public void deleteRoutingHost(final HostVO host, final boolean isForced, final b
logger.debug("Cannot transmit host {} to Disabled state", host, e);
}
for (final VMInstanceVO vm : vms) {
if ((!HighAvailabilityManager.ForceHA.value() && !vm.isHaEnabled()) || vm.getState() == State.Stopping) {
if ((!HighAvailabilityManager.ForceHA.valueIn(host.getClusterId()) && !vm.isHaEnabled()) || vm.getState() == State.Stopping) {
logger.debug(String.format("Stopping %s as a part of hostDelete for %s",vm, host));
try {
_haMgr.scheduleStop(vm, host.getId(), WorkType.Stop);
Expand All @@ -2861,7 +2860,7 @@ public void deleteRoutingHost(final HostVO host, final boolean isForced, final b
logger.debug(errorMsg, e);
throw new UnableDeleteHostException(errorMsg + "," + e.getMessage());
}
} else if ((HighAvailabilityManager.ForceHA.value() || vm.isHaEnabled()) && (vm.getState() == State.Running || vm.getState() == State.Starting)) {
} else if ((HighAvailabilityManager.ForceHA.valueIn(host.getClusterId()) || vm.isHaEnabled()) && (vm.getState() == State.Running || vm.getState() == State.Starting)) {
logger.debug(String.format("Scheduling restart for %s, state: %s on host: %s.", vm, vm.getState(), host));
_haMgr.scheduleRestart(vm, false);
}
Expand Down
Loading