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

fixed problem with halted local storage vms

This commit is contained in:
Alex Huang 2011-01-31 16:42:52 -08:00
parent 209713fba5
commit 9b8d251afd
1 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
View File

@ -278,6 +278,23 @@ public abstract class CitrixResourceBase implements ServerResource {
s_statesTable.put(Types.VmPowerState.UNRECOGNIZED, State.Unknown);
}
protected void cleanupHaltedVms(Connection conn) throws XenAPIException, XmlRpcException {
Host host = Host.getByUuid(conn, _host.uuid);
Set<VM> vms = host.getResidentVMs(conn);
for (VM vm : vms) {
try {
if (VmPowerState.HALTED.equals(vm.getPowerState(conn))) {
vm.destroy(conn);
}
} catch (XenAPIException e) {
s_logger.warn("Unable to cleanup " + vm);
} catch (XmlRpcException e) {
s_logger.warn("Unable to cleanup " + vm);
}
}
}
protected boolean isRefNull(XenAPIObject object) {
return (object == null || object.toWireString().equals("OpaqueRef:NULL"));
@ -3724,6 +3741,16 @@ public abstract class CitrixResourceBase implements ServerResource {
return null;
}
try {
cleanupHaltedVms(conn);
} catch (XenAPIException e) {
s_logger.warn("Unable to cleanup halted vms", e);
return null;
} catch (XmlRpcException e) {
s_logger.warn("Unable to cleanup halted vms", e);
return null;
}
StartupRoutingCommand cmd = new StartupRoutingCommand();
fillHostInfo(conn, cmd);