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

missing state transitions for ha

Browse Source
This commit is contained in:
Alex Huang 2011-01-18 16:33:29 -08:00
parent 28137b805b
commit 1d8ece0671
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -303,6 +303,7 @@ public class HighAvailabilityManagerImpl implements HighAvailabilityManager {
}
}
_itMgr.stateTransitTo(vm, Event.AgentReportStopped, null);
mgr.finalizeStop(new VirtualMachineProfileImpl<VMInstanceVO>(vm), null);
}
@ -415,6 +416,7 @@ public class HighAvailabilityManagerImpl implements HighAvailabilityManager {
return (System.currentTimeMillis() >> 10) + _restartRetryInterval;
}
_itMgr.stateTransitTo(vm, Event.AgentReportStopped, null);
mgr.finalizeStop(new VirtualMachineProfileImpl<VMInstanceVO>(vm), null);
work.setStep(Step.Scheduled);
@ -552,6 +554,7 @@ public class HighAvailabilityManagerImpl implements HighAvailabilityManager {
if (fullSync) {
s_logger.debug("VM is in stopping state on full sync. Updating the status to stopped");
vm = info.mgr.findById(vm.getId());
_itMgr.stateTransitTo(vm, Event.AgentReportStopped, null);
info.mgr.finalizeStop(new VirtualMachineProfileImpl<VMInstanceVO>(vm), null);
command = info.mgr.cleanup(vm, agentName);
} else {
@ -569,12 +572,14 @@ public class HighAvailabilityManagerImpl implements HighAvailabilityManager {
if (fullSync) {
s_logger.debug("VM state is starting on full sync so updating it to running");
vm = info.mgr.findById(vm.getId());
_itMgr.stateTransitTo(vm, Event.AgentReportRunning, vm.getHostId());
info.mgr.finalizeStart(new VirtualMachineProfileImpl<VMInstanceVO>(vm), vm.getHostId(), null, null);
}
} else if (serverState == State.Stopping) {
if (fullSync) {
s_logger.debug("VM state is in stopping on fullsync so resend stop.");
vm = info.mgr.findById(vm.getId());
_itMgr.stateTransitTo(vm, Event.AgentReportStopped, null);
info.mgr.finalizeStop(new VirtualMachineProfileImpl<VMInstanceVO>(vm), null);
command = info.mgr.cleanup(vm, agentName);
} else {
@ -912,6 +917,7 @@ public class HighAvailabilityManagerImpl implements HighAvailabilityManager {
Command cmd = mgr.cleanup(vm, null);
Answer ans = _agentMgr.send(work.getHostId(), cmd);
if (ans.getResult()) {
_itMgr.stateTransitTo(vm, Event.AgentReportStopped, null);
mgr.finalizeStop(new VirtualMachineProfileImpl<VMInstanceVO>(vm), (StopAnswer)ans);
s_logger.info("Successfully stopped " + vm.toString());
return null;