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

bug 8061: add forcely shutdown

This commit is contained in:
anthony 2011-03-09 16:28:26 -08:00
parent b5a36df966
commit bdcffa2b0d
2 changed files with 40 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2751,6 +2751,19 @@ public abstract class CitrixResourceBase implements ServerResource {
}
}
void forceShutdownVM(Connection conn, VM vm) {
try {
Long domId = vm.getDomid(conn);
callHostPlugin(conn, "vmopspremium", "forceShutdownVM", "domId", domId.toString());
vm.powerStateReset(conn);
vm.destroy(conn);
} catch (Exception e) {
String msg = "forceShutdown failed due to " + e.toString();
s_logger.warn(msg, e);
throw new CloudRuntimeException(msg);
}
}
void shutdownVM(Connection conn, VM vm, String vmName) throws XmlRpcException {
Task task = null;
try {
@ -2771,7 +2784,16 @@ public abstract class CitrixResourceBase implements ServerResource {
try {
Types.VmPowerState state = vm.getPowerState(conn);
if (state == Types.VmPowerState.RUNNING ) {
vm.hardShutdown(conn);
try {
vm.hardShutdown(conn);
} catch (Exception e1) {
s_logger.debug("Unable to hardShutdown VM(" + vmName + ") on host(" + _host.uuid +") due to " + e.toString());
state = vm.getPowerState(conn);
if (state == Types.VmPowerState.RUNNING ) {
forceShutdownVM(conn, vm);
}
return;
}
} else if (state == Types.VmPowerState.HALTED ) {
return;
} else {
@ -3031,7 +3053,8 @@ public abstract class CitrixResourceBase implements ServerResource {
disableVlanNetwork(conn, network);
}
}
}
return new StopAnswer(cmd, "Stop VM " + vmName + " Succeed", 0, bytesSent, bytesRcvd);
}
} catch (XenAPIException e) {
String msg = "VM destroy failed in Stop " + vmName + " Command due to " + e.toString();
s_logger.warn(msg, e);
@ -3045,7 +3068,7 @@ public abstract class CitrixResourceBase implements ServerResource {
}
}
}
return new StopAnswer(cmd, "Stop VM " + vmName + " Succeed", 0, bytesSent, bytesRcvd);
} catch (XenAPIException e) {
String msg = "Stop Vm " + vmName + " fail due to " + e.toString();
s_logger.warn(msg, e);
@ -3055,6 +3078,7 @@ public abstract class CitrixResourceBase implements ServerResource {
s_logger.warn(msg, e);
return new StopAnswer(cmd, msg);
}
return new StopAnswer(cmd, "Stop VM failed");
}
private List<VDI> getVdis(Connection conn, VM vm) {
@ -3149,15 +3173,8 @@ public abstract class CitrixResourceBase implements ServerResource {
}
protected String callHostPlugin(Connection conn, String plugin, String cmd, String... params) {
//default time out is 300 s
return callHostPluginWithTimeOut(conn, plugin, cmd, 300, params);
}
protected String callHostPluginWithTimeOut(Connection conn, String plugin, String cmd, int timeout, String... params) {
Map<String, String> args = new HashMap<String, String>();
try {
for (int i = 0; i < params.length; i += 2) {
args.put(params[i], params[i + 1]);
}
@ -5703,7 +5720,7 @@ public abstract class CitrixResourceBase implements ServerResource {
checksum = "";
}
String result = callHostPluginWithTimeOut(conn, "vmopsSnapshot", "post_create_private_template", 110*60, "templatePath", templatePath, "templateFilename", tmpltFilename, "templateName", templateName, "templateDescription", templateDescription,
String result = callHostPlugin(conn, "vmopsSnapshot", "post_create_private_template", "templatePath", templatePath, "templateFilename", tmpltFilename, "templateName", templateName, "templateDescription", templateDescription,
"checksum", checksum, "size", String.valueOf(size), "virtualSize", String.valueOf(virtualSize), "templateId", String.valueOf(templateId));
boolean success = false;

13
scripts/vm/hypervisor/xenserver/vmopspremium
View File

@ -17,6 +17,17 @@ def echo(fn):
return res
return wrapped
@echo
def forceShutdownVM(session, args):
domId = args['domId']
try:
cmd = ["/opt/xensource/debug/xenops", "destroy_domain", "-domid", domId]
txt = util.pread2(cmd)
except:
txt = '10#failed'
return txt
@echo
def create_privatetemplate_from_snapshot(session, args):
templatePath = args['templatePath']
@ -108,5 +119,5 @@ def heartbeat(session, args):
return txt
if __name__ == "__main__":
XenAPIPlugin.dispatch({"upgrade_snapshot":upgrade_snapshot, "create_privatetemplate_from_snapshot":create_privatetemplate_from_snapshot, "copy_vhd_to_secondarystorage":copy_vhd_to_secondarystorage, "copy_vhd_from_secondarystorage":copy_vhd_from_secondarystorage, "setup_heartbeat_sr":setup_heartbeat_sr, "setup_heartbeat_file":setup_heartbeat_file, "check_heartbeat":check_heartbeat, "heartbeat": heartbeat})
XenAPIPlugin.dispatch({"forceShutdownVM":forceShutdownVM, "upgrade_snapshot":upgrade_snapshot, "create_privatetemplate_from_snapshot":create_privatetemplate_from_snapshot, "copy_vhd_to_secondarystorage":copy_vhd_to_secondarystorage, "copy_vhd_from_secondarystorage":copy_vhd_from_secondarystorage, "setup_heartbeat_sr":setup_heartbeat_sr, "setup_heartbeat_file":setup_heartbeat_file, "check_heartbeat":check_heartbeat, "heartbeat": heartbeat})