apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-04 00:02:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Let HA manager support native HA

Browse Source
This commit is contained in:
Kelven Yang 2011-02-02 17:59:09 -08:00
parent 7b1ed3917f
commit b12444bb64
1 changed files with 41 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
View File

@ -39,6 +39,8 @@ import com.cloud.agent.api.Command;
import com.cloud.agent.api.StopAnswer; import com.cloud.agent.api.StopAnswer;
import com.cloud.alert.AlertManager; import com.cloud.alert.AlertManager;
import com.cloud.configuration.dao.ConfigurationDao; import com.cloud.configuration.dao.ConfigurationDao;
import com.cloud.dc.ClusterDetailsDao;
import com.cloud.dc.ClusterDetailsVO;
import com.cloud.dc.DataCenterVO; import com.cloud.dc.DataCenterVO;
import com.cloud.dc.HostPodVO; import com.cloud.dc.HostPodVO;
import com.cloud.dc.dao.DataCenterDao; import com.cloud.dc.dao.DataCenterDao;
@ -125,6 +127,7 @@ public class HighAvailabilityManagerImpl implements HighAvailabilityManager {
@Inject HostDao _hostDao; @Inject HostDao _hostDao;
@Inject DataCenterDao _dcDao; @Inject DataCenterDao _dcDao;
@Inject HostPodDao _podDao; @Inject HostPodDao _podDao;
@Inject ClusterDetailsDao _clusterDetailsDao;
long _serverId; long _serverId;
@Inject(adapter=Investigator.class) @Inject(adapter=Investigator.class)
Adapters<Investigator> _investigators; Adapters<Investigator> _investigators;
@ -353,6 +356,7 @@ public class HighAvailabilityManagerImpl implements HighAvailabilityManager {
} }
final HostVO host = _hostDao.findById(work.getHostId()); final HostVO host = _hostDao.findById(work.getHostId());
boolean nativeHA = isHostClusterNativeHAEnabled(work.getHostId());
DataCenterVO dcVO = _dcDao.findById(host.getDataCenterId()); DataCenterVO dcVO = _dcDao.findById(host.getDataCenterId());
HostPodVO podVO = _podDao.findById(host.getPodId()); HostPodVO podVO = _podDao.findById(host.getPodId());
@ -388,7 +392,7 @@ public class HighAvailabilityManagerImpl implements HighAvailabilityManager {
if (alive != null && alive) { if (alive != null && alive) {
s_logger.debug("VM " + vm.getName() + " is found to be alive by " + investigator.getName()); s_logger.debug("VM " + vm.getName() + " is found to be alive by " + investigator.getName());
if (host.getStatus() == Status.Up) { if (host.getStatus() == Status.Up) {
compareState(vm, new AgentVmInfo(vm.getInstanceName(), mgr, State.Running), false); compareState(vm, new AgentVmInfo(vm.getInstanceName(), mgr, State.Running), false, nativeHA);
return null; return null;
} else { } else {
s_logger.debug("Rescheduling because the host is not up but the vm is alive"); s_logger.debug("Rescheduling because the host is not up but the vm is alive");
@ -486,7 +490,7 @@ public class HighAvailabilityManagerImpl implements HighAvailabilityManager {
* cleaned up * cleaned up
* *
*/ */
protected Command compareState(VMInstanceVO vm, final AgentVmInfo info, final boolean fullSync) { protected Command compareState(VMInstanceVO vm, final AgentVmInfo info, final boolean fullSync, boolean nativeHA) {
State agentState = info.state; State agentState = info.state;
final String agentName = info.name; final String agentName = info.name;
final State serverState = vm.getState(); final State serverState = vm.getState();
@ -546,10 +550,14 @@ public class HighAvailabilityManagerImpl implements HighAvailabilityManager {
// was never completed but we still send down a Stop Command // was never completed but we still send down a Stop Command
// to ensure there's cleanup. // to ensure there's cleanup.
if (serverState == State.Running ) { if (serverState == State.Running ) {
// Our records showed that it should be running so let's restart it. if(!nativeHA) {
vm = info.mgr.findById(vm.getId()); // Our records showed that it should be running so let's restart it.
scheduleRestart(vm, false); vm = info.mgr.findById(vm.getId());
command = info.mgr.cleanup(vm, agentName); scheduleRestart(vm, false);
command = info.mgr.cleanup(vm, agentName);
} else {
s_logger.info("VM is in runnting state, agent reported as stopped and native HA is enabled => skip sync action");
}
} else if (serverState == State.Stopping) { } else if (serverState == State.Stopping) {
if (fullSync) { if (fullSync) {
s_logger.debug("VM is in stopping state on full sync. Updating the status to stopped"); s_logger.debug("VM is in stopping state on full sync. Updating the status to stopped");
@ -621,6 +629,8 @@ public class HighAvailabilityManagerImpl implements HighAvailabilityManager {
final Map<Long, AgentVmInfo> states = convertToIds(newStates); final Map<Long, AgentVmInfo> states = convertToIds(newStates);
final ArrayList<Command> commands = new ArrayList<Command>(); final ArrayList<Command> commands = new ArrayList<Command>();
boolean nativeHA = isHostClusterNativeHAEnabled(hostId);
for (final VMInstanceVO vm : vms) { for (final VMInstanceVO vm : vms) {
AgentVmInfo info = states.remove(vm.getId()); AgentVmInfo info = states.remove(vm.getId());
@ -631,7 +641,7 @@ public class HighAvailabilityManagerImpl implements HighAvailabilityManager {
assert info.mgr != null : "How can the manager be null for " + vm.getType(); assert info.mgr != null : "How can the manager be null for " + vm.getType();
VMInstanceVO vmCasted = info.mgr.findById(vm.getId()); VMInstanceVO vmCasted = info.mgr.findById(vm.getId());
final Command command = compareState(vmCasted, info, true); final Command command = compareState(vmCasted, info, true, nativeHA);
if (command != null) { if (command != null) {
commands.add(command); commands.add(command);
} }
@ -673,7 +683,9 @@ public class HighAvailabilityManagerImpl implements HighAvailabilityManager {
public List<Command> deltaSync(final long hostId, final Map<String, State> newStates) { public List<Command> deltaSync(final long hostId, final Map<String, State> newStates) {
final Map<Long, AgentVmInfo> states = convertToIds(newStates); final Map<Long, AgentVmInfo> states = convertToIds(newStates);
final ArrayList<Command> commands = new ArrayList<Command>(); final ArrayList<Command> commands = new ArrayList<Command>();
boolean nativeHA = isHostClusterNativeHAEnabled(hostId);
for (final Map.Entry<Long, AgentVmInfo> entry : states.entrySet()) { for (final Map.Entry<Long, AgentVmInfo> entry : states.entrySet()) {
final AgentVmInfo info = entry.getValue(); final AgentVmInfo info = entry.getValue();
@ -681,10 +693,20 @@ public class HighAvailabilityManagerImpl implements HighAvailabilityManager {
Command command = null; Command command = null;
if (vm != null && vm.getHostId() != null && vm.getHostId() == hostId) { if (vm != null && vm.getHostId() != null && vm.getHostId() == hostId) {
command = compareState(vm, info, false); command = compareState(vm, info, false, nativeHA);
} else { } else {
s_logger.debug("VM is not found. Stopping " + info.name); if(nativeHA) {
command = info.mgr.cleanup(null, info.name); if(vm.getHostId() != null && vm.getHostId() != hostId && info.state == VirtualMachine.State.Running) {
vm.setHostId(hostId);
_instanceDao.update(vm.getId(), vm);
s_logger.info("Native is enabled and we found VM has been switched from host " + vm.getHostId() + " to " + hostId);
command = compareState(vm, info, false, nativeHA);
}
} else {
s_logger.debug("VM is not found. Stopping " + info.name);
command = info.mgr.cleanup(null, info.name);
}
} }
if (command != null) { if (command != null) {
@ -694,6 +716,14 @@ public class HighAvailabilityManagerImpl implements HighAvailabilityManager {
return commands; return commands;
} }
private boolean isHostClusterNativeHAEnabled(long hostId) {
HostVO host = _hostDao.findById(hostId);
ClusterDetailsVO detail = _clusterDetailsDao.findDetail(host.getClusterId(), "NativeHA");
if(detail != null && detail.getValue() != null && detail.getValue().equalsIgnoreCase("true"))
return true;
return false;
}
public Long migrate(final HaWorkVO work) { public Long migrate(final HaWorkVO work) {
long vmId = work.getInstanceId(); long vmId = work.getInstanceId();