Fixed deletion on VM's on hyperv host when mgmt server gets restarted due to HA
Conflicts:
server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3a5c7f1e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3a5c7f1e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3a5c7f1e
Branch: refs/heads/hyperv
Commit: 3a5c7f1e4a995a083790eb2e16c3a3d1cdcb2a8f
Parents: 0d424d1
Author: Rajesh Battala <rajesh.batt...@citrix.com>
Authored: Fri Oct 11 11:54:53 2013 +0530
Committer: Rajesh Battala <rajesh.batt...@citrix.com>
Committed: Fri Oct 11 11:58:20 2013 +0530
----------------------------------------------------------------------
server/src/com/cloud/ha/HighAvailabilityManagerImpl.java | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3a5c7f1e/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
b/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
index 464b952..d853b47 100755
--- a/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
+++ b/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
@@ -203,8 +203,8 @@ public class HighAvailabilityManagerImpl extends
ManagerBase implements HighAvai
return;
}
- if(host.getHypervisorType() == HypervisorType.VMware) {
- s_logger.info("Don't restart for VMs on host " + host.getId() + "
as the host is VMware host");
+ if(host.getHypervisorType() == HypervisorType.VMware ||
host.getHypervisorType() == HypervisorType.Hyperv) {
+ s_logger.info("Don't restart for VMs on host " + host.getId() + "
as the host is VMware host or on Hyperv Host");
return;
}
@@ -299,6 +299,11 @@ public class HighAvailabilityManagerImpl extends
ManagerBase implements HighAvai
return;
}
+ if(vm.getHypervisorType() == HypervisorType.VMware ||
vm.getHypervisorType() == HypervisorType.Hyperv) {
+ s_logger.info("Skip HA for VMware VM or Hyperv VM" +
vm.getInstanceName());
+ return;
+ }
+
if (!investigate) {
if (s_logger.isDebugEnabled()) {
s_logger.debug("VM does not require investigation so I'm
marking it as Stopped: " + vm.toString());
