[GitHub] [cloudstack] harikrishna-patnala commented on a change in pull request #4647: forceha: fix two issues when (1)stop vm from inside (2) force remove host

[GitBox <gi...@apache.org>]

harikrishna-patnala commented on a change in pull request #4647:
URL: https://github.com/apache/cloudstack/pull/4647#discussion_r569929451



##########
File path: engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java
##########
@@ -4498,7 +4498,7 @@ private void handlePowerOffReportWithNoPendingJobsOnVM(final VMInstanceVO vm) {
                         String.format("VM %s is at %s and we received a %s report while there is no pending jobs on it"
                                 , vm.getInstanceName(), vm.getState(), vm.getPowerState()));
             }
-            if(vm.isHaEnabled() && vm.getState() == State.Running
+            if((HighAvailabilityManager.ForceHA.value() || vm.isHaEnabled()) && vm.getState() == State.Running

Review comment:
       ForceHA setting is scoped to cluster, I think we need to use ForceHA.valueIn(clusterid) method 




----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org