Skip to content

Added HA capability to the VMs during VMware Host alert #7352

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

Closed
harikrishna-patnala wants to merge 1 commit into from
Closed

Added HA capability to the VMs during VMware Host alert #7352

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 8 additions & 2 deletions engine/orchestration/src/main/java/com/cloud/agent/manager/AgentManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -927,8 +927,14 @@ protected boolean handleDisconnectWithInvestigation(final AgentAttache attache,
}
handleDisconnectWithoutInvestigation(attache, event, true, true);
host = _hostDao.findById(hostId); // Maybe the host magically reappeared?
if (host != null && host.getStatus() == Status.Down) {
_haMgr.scheduleRestartForVmsOnHost(host, true);
if (host != null) {
if (host.getStatus() == Status.Down) {
_haMgr.scheduleRestartForVmsOnHost(host, true);
} else {
if (HypervisorType.VMware.equals(host.getHypervisorType()) && host.getStatus() == Status.Alert) {
_haMgr.scheduleRestartForVmsOnHost(host, false);
}
}
}
return true;
}
Expand Down
11 changes: 3 additions & 8 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 @@ -238,7 +238,7 @@ public void scheduleRestartForVmsOnHost(final HostVO host, boolean investigate)
return;
}

if (host.getHypervisorType() == HypervisorType.VMware || host.getHypervisorType() == HypervisorType.Hyperv) {
if (host.getHypervisorType() == HypervisorType.Hyperv) {
s_logger.info("Don't restart VMs on host " + host.getId() + " as it is a " + host.getHypervisorType().toString() + " host");
return;
}
Expand Down Expand Up @@ -349,8 +349,8 @@ public void scheduleRestart(VMInstanceVO vm, boolean investigate) {
}
}

if (vm.getHypervisorType() == HypervisorType.VMware || vm.getHypervisorType() == HypervisorType.Hyperv) {
s_logger.info("Skip HA for VMware VM or Hyperv VM" + vm.getInstanceName());
if (vm.getHypervisorType() == HypervisorType.Hyperv) {
s_logger.info("Skip HA for Hyperv VM" + vm.getInstanceName());
return;
}

Expand Down Expand Up @@ -394,11 +394,6 @@ public void scheduleRestart(VMInstanceVO vm, boolean investigate) {
}
}

if (vm.getHypervisorType() == HypervisorType.VMware) {
s_logger.info("Skip HA for VMware VM " + vm.getInstanceName());
return;
}

List<HaWorkVO> items = _haDao.findPreviousHA(vm.getId());
int timesTried = 0;
for (HaWorkVO item : items) {
Expand Down