Check config 'kvm.ha.fence.on.storage.heartbeat.failure' value in zone scope before global

Author: sureshanaparti

plugins/hypervisors/kvm/src/main/java/org/apache/cloudstack/kvm/ha/KVMHostActivityChecker.java

@@ -123,7 +123,7 @@ public Status getHostAgentStatus(Host host) {
 
     private Status checkHostStatusWithSameHost(Host host) {
         Status hostStatus;
-        boolean reportFailureIfOneStorageIsDown = HighAvailabilityManager.KvmHAFenceHostIfHeartbeatFailsOnStorage.value();
+        boolean reportFailureIfOneStorageIsDown = HighAvailabilityManager.KvmHAFenceHostIfHeartbeatFailsOnStorage.valueIn(host.getDataCenterId());
         final CheckOnHostCommand cmd = new CheckOnHostCommand(host, reportFailureIfOneStorageIsDown);
         try {
             logger.debug("Checking {} status...", host.toString());
@@ -150,7 +150,7 @@ private Status checkHostStatusWithSameHost(Host host) {
 
     private Status checkHostStatusWithNeighbourHosts(Host host) {
         Status hostStatusFromNeighbour = Status.Unknown;
-        boolean reportFailureIfOneStorageIsDown = HighAvailabilityManager.KvmHAFenceHostIfHeartbeatFailsOnStorage.value();
+        boolean reportFailureIfOneStorageIsDown = HighAvailabilityManager.KvmHAFenceHostIfHeartbeatFailsOnStorage.valueIn(host.getDataCenterId());
         final CheckOnHostCommand cmd = new CheckOnHostCommand(host, reportFailureIfOneStorageIsDown);
         List<HostVO> neighbors = resourceManager.listHostsInClusterByStatus(host.getClusterId(), Status.Up);
         for (HostVO neighbor : neighbors) {

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

@@ -80,7 +80,7 @@ public Boolean fenceOff(VirtualMachine vm, Host host) {
 
         List<HostVO> hosts = _resourceMgr.listAllHostsInCluster(host.getClusterId());
         FenceCommand fence = new FenceCommand(vm, host);
-        fence.setReportCheckFailureIfOneStorageIsDown(HighAvailabilityManager.KvmHAFenceHostIfHeartbeatFailsOnStorage.value());
+        fence.setReportCheckFailureIfOneStorageIsDown(HighAvailabilityManager.KvmHAFenceHostIfHeartbeatFailsOnStorage.valueIn(host.getDataCenterId()));
 
         int i = 0;
         for (HostVO h : hosts) {