etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug 11208: use cleanup instead of scheduling to stop based on server state

This commit is contained in:
Kelven Yang 2011-08-22 17:35:28 -07:00
parent 773065de9e
commit c312ad4b99
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
server/src/com/cloud/vm/VirtualMachineManagerImpl.java
View File

@ -1654,11 +1654,14 @@ public class VirtualMachineManagerImpl implements VirtualMachineManager, Listene
s_logger.warn(e.getMessage());
}
}
} else if (serverState == State.Stopping || serverState == State.Stopped || serverState == State.Expunging || serverState == State.Destroyed || serverState == State.Error) {
} else if (serverState == State.Stopping) {
s_logger.debug("Scheduling a stop command for " + vm);
_haMgr.scheduleStop(vm, hostId, WorkType.Stop);
} else if(serverState == State.Stopped || serverState == State.Expunging || serverState == State.Destroyed || serverState == State.Error) {
s_logger.debug("Cleanup vm " + vm + " as its server state is at " + serverState);
command = cleanup(agentName);
} else {
s_logger.debug("server VM state " + serverState + " does not meet expectation of a running VM report from agent");
s_logger.warn("server VM state " + serverState + " does not meet expectation of a running VM report from agent");
// just be careful not to stop VM for things we don't handle
// command = cleanup(agentName);