CLOUDSTACK-8438: Proper enforcement of hypervisor capability "max. guest limit"

koushik-das · koushik-das · commit 3100fc15544b · 2015-05-01T12:49:56.000+05:30
VMs in transition states - Starting, Stopping, Migrating - are also taken into account for enforcing "max. guest limit"
diff --git a/engine/schema/src/com/cloud/vm/dao/VMInstanceDao.java b/engine/schema/src/com/cloud/vm/dao/VMInstanceDao.java
@@ -104,7 +104,7 @@ public interface VMInstanceDao extends GenericDao<VMInstanceVO, Long>, StateDao<
 
     List<VMInstanceVO> listVmsMigratingFromHost(Long hostId);
 
-    public Long countRunningByHostId(long hostId);
+    public Long countActiveByHostId(long hostId);
 
     Pair<List<Long>, Map<Long, Double>> listClusterIdsInZoneByVmCount(long zoneId, long accountId);
 
diff --git a/engine/schema/src/com/cloud/vm/dao/VMInstanceDaoImpl.java b/engine/schema/src/com/cloud/vm/dao/VMInstanceDaoImpl.java
@@ -87,7 +87,7 @@ public class VMInstanceDaoImpl extends GenericDaoBase<VMInstanceVO, Long> implem
     protected SearchBuilder<VMInstanceVO> HostNameSearch;
     protected SearchBuilder<VMInstanceVO> HostNameAndZoneSearch;
     protected GenericSearchBuilder<VMInstanceVO, Long> FindIdsOfVirtualRoutersByAccount;
-    protected GenericSearchBuilder<VMInstanceVO, Long> CountRunningByHost;
+    protected GenericSearchBuilder<VMInstanceVO, Long> CountActiveByHost;
     protected GenericSearchBuilder<VMInstanceVO, Long> CountRunningByAccount;
     protected SearchBuilder<VMInstanceVO> NetworkTypeSearch;
     protected GenericSearchBuilder<VMInstanceVO, String> DistinctHostNameSearch;
@@ -231,11 +231,11 @@ protected void init() {
         FindIdsOfVirtualRoutersByAccount.and("state", FindIdsOfVirtualRoutersByAccount.entity().getState(), SearchCriteria.Op.NIN);
         FindIdsOfVirtualRoutersByAccount.done();
 
-        CountRunningByHost = createSearchBuilder(Long.class);
-        CountRunningByHost.select(null, Func.COUNT, null);
-        CountRunningByHost.and("host", CountRunningByHost.entity().getHostId(), SearchCriteria.Op.EQ);
-        CountRunningByHost.and("state", CountRunningByHost.entity().getState(), SearchCriteria.Op.EQ);
-        CountRunningByHost.done();
+        CountActiveByHost = createSearchBuilder(Long.class);
+        CountActiveByHost.select(null, Func.COUNT, null);
+        CountActiveByHost.and("host", CountActiveByHost.entity().getHostId(), SearchCriteria.Op.EQ);
+        CountActiveByHost.and("state", CountActiveByHost.entity().getState(), SearchCriteria.Op.IN);
+        CountActiveByHost.done();
 
         CountRunningByAccount = createSearchBuilder(Long.class);
         CountRunningByAccount.select(null, Func.COUNT, null);
@@ -530,10 +530,10 @@ public List<VMInstanceVO> listVmsMigratingFromHost(Long hostId) {
     }
 
     @Override
-    public Long countRunningByHostId(long hostId) {
-        SearchCriteria<Long> sc = CountRunningByHost.create();
+    public Long countActiveByHostId(long hostId) {
+        SearchCriteria<Long> sc = CountActiveByHost.create();
         sc.setParameters("host", hostId);
-        sc.setParameters("state", State.Running);
+        sc.setParameters("state", State.Running, State.Starting, State.Stopping, State.Migrating);
         return customSearch(sc, null).get(0);
     }
 
diff --git a/server/src/com/cloud/capacity/CapacityManagerImpl.java b/server/src/com/cloud/capacity/CapacityManagerImpl.java
@@ -1052,7 +1052,7 @@ public void processPrepareMaintenaceEventBefore(Long hostId) {
 
     @Override
     public boolean checkIfHostReachMaxGuestLimit(Host host) {
-        Long vmCount = _vmDao.countRunningByHostId(host.getId());
+        Long vmCount = _vmDao.countActiveByHostId(host.getId());
         HypervisorType hypervisorType = host.getHypervisorType();
         String hypervisorVersion = host.getHypervisorVersion();
         Long maxGuestLimit = _hypervisorCapabilitiesDao.getMaxGuestsLimit(hypervisorType, hypervisorVersion);
