From a3b16091994637802fdae16a9fb5baea444026d0 Mon Sep 17 00:00:00 2001 From: nit Date: Tue, 8 Feb 2011 16:22:57 +0530 Subject: [PATCH] bug 8463: Decrease the resource_count if vm fails to Start and goes to ERROR state. status 8463: resolved fixed --- server/src/com/cloud/vm/UserVmManagerImpl.java | 4 ++-- server/src/com/cloud/vm/VirtualMachineManagerImpl.java | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) mode change 100644 => 100755 server/src/com/cloud/vm/VirtualMachineManagerImpl.java diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java index e4b1872d195..01a342ea4b5 100755 --- a/server/src/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/com/cloud/vm/UserVmManagerImpl.java @@ -2081,11 +2081,11 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager if (group != null) { boolean addToGroup = addInstanceToGroup(Long.valueOf(id), group); if (!addToGroup) { - throw new CloudRuntimeException("Unable to assing Vm to the group " + group); + throw new CloudRuntimeException("Unable to assign Vm to the group " + group); } } } catch (Exception ex) { - throw new CloudRuntimeException("Unable to assing Vm to the group " + group); + throw new CloudRuntimeException("Unable to assign Vm to the group " + group); } return vm; diff --git a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java old mode 100644 new mode 100755 index 5f9b525f106..4c84142b34b --- a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java +++ b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java @@ -62,6 +62,7 @@ import com.cloud.capacity.CapacityManager; import com.cloud.cluster.ClusterManager; import com.cloud.configuration.Config; import com.cloud.configuration.ConfigurationManager; +import com.cloud.configuration.ResourceCount.ResourceType; import com.cloud.configuration.dao.ConfigurationDao; import com.cloud.consoleproxy.ConsoleProxyManager; import com.cloud.dc.DataCenter; @@ -619,7 +620,8 @@ public class VirtualMachineManagerImpl implements VirtualMachineManager, StateLi } if (dest == null) { - throw new InsufficientServerCapacityException("Unable to create a deployment for " + vmProfile, DataCenter.class, plan.getDataCenterId()); + _accountMgr.decrementResourceCount(vm.getAccountId(), ResourceType.user_vm); + throw new InsufficientServerCapacityException("Unable to create a deployment for " + vmProfile, DataCenter.class, plan.getDataCenterId()); } long destHostId = dest.getHost().getId();