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

bug 11678: added vm.destory.forcestop config var to set force when destroying a vm

This commit is contained in:
Abhinandan Prateek 2011-11-02 17:47:08 +05:30
parent e6474ff85a
commit 15a8c015ea
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/src/com/cloud/configuration/Config.java
View File

@ -194,7 +194,8 @@ public enum Config {
CapacitySkipcountingHours("Advanced", ManagementServer.class, Integer.class, "capacity.skipcounting.hours", "3600", "Time (in seconds) to wait before release VM's cpu and memory when VM in stopped state", null),
VmStatsInterval("Advanced", ManagementServer.class, Integer.class, "vm.stats.interval", "60000", "The interval (in milliseconds) when vm stats are retrieved from agents.", null),
VmTransitionWaitInterval("Advanced", ManagementServer.class, Integer.class, "vm.tranisition.wait.interval", "3600", "Time (in seconds) to wait before taking over a VM in transition state", null),
VmDestroyForcestop("Advanced", ManagementServer.class, Boolean.class, "vm.destory.forcestop", "false", "On destory, force-stop takes this value ", null),
ControlCidr("Advanced", ManagementServer.class, String.class, "control.cidr", "169.254.0.0/16", "Changes the cidr for the control network traffic. Defaults to using link local. Must be unique within pods", null),
ControlGateway("Advanced", ManagementServer.class, String.class, "control.gateway", "169.254.0.1", "gateway for the control network traffic", null),
UseUserConcentratedPodAllocation("Advanced", ManagementServer.class, Boolean.class, "use.user.concentrated.pod.allocation", "true", "If true, deployment planner applies the user concentration heuristic during VM resource allocation", "true,false"),

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

@ -215,6 +215,8 @@ public class VirtualMachineManagerImpl implements VirtualMachineManager, Listene
protected StoragePoolDao _storagePoolDao;
@Inject
protected HypervisorGuruManager _hvGuruMgr;
@Inject
protected ConfigurationDao _configDao;
@Inject(adapter = DeploymentPlanner.class)
protected Adapters<DeploymentPlanner> _planners;
@ -1138,8 +1140,8 @@ public class VirtualMachineManagerImpl implements VirtualMachineManager, Listene
}
return true;
}
if (!advanceStop(vm, false, user, caller)) {
boolean forceStop = Boolean.parseBoolean(_configDao.getValue("vm.destory.forcestop"));
if (!advanceStop(vm, forceStop, user, caller)) {
s_logger.debug("Unable to stop " + vm);
return false;
}