apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
VMs in transition states - Starting, Stopping, Migrating - are also taken into account for enforcing "max. guest limit"
This commit is contained in:
Koushik Das 2015-05-01 12:46:24 +05:30
parent 9e3b825f91
commit 3100fc1554
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine/schema/src/com/cloud/vm/dao/VMInstanceDao.java
View File

@ -104,7 +104,7 @@ public interface VMInstanceDao extends GenericDao<VMInstanceVO, Long>, StateDao<
List<VMInstanceVO> listVmsMigratingFromHost(Long hostId); 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); Pair<List<Long>, Map<Long, Double>> listClusterIdsInZoneByVmCount(long zoneId, long accountId);

18
engine/schema/src/com/cloud/vm/dao/VMInstanceDaoImpl.java
View File

@ -87,7 +87,7 @@ public class VMInstanceDaoImpl extends GenericDaoBase<VMInstanceVO, Long> implem
protected SearchBuilder<VMInstanceVO> HostNameSearch; protected SearchBuilder<VMInstanceVO> HostNameSearch;
protected SearchBuilder<VMInstanceVO> HostNameAndZoneSearch; protected SearchBuilder<VMInstanceVO> HostNameAndZoneSearch;
protected GenericSearchBuilder<VMInstanceVO, Long> FindIdsOfVirtualRoutersByAccount; protected GenericSearchBuilder<VMInstanceVO, Long> FindIdsOfVirtualRoutersByAccount;
protected GenericSearchBuilder<VMInstanceVO, Long> CountRunningByHost; protected GenericSearchBuilder<VMInstanceVO, Long> CountActiveByHost;
protected GenericSearchBuilder<VMInstanceVO, Long> CountRunningByAccount; protected GenericSearchBuilder<VMInstanceVO, Long> CountRunningByAccount;
protected SearchBuilder<VMInstanceVO> NetworkTypeSearch; protected SearchBuilder<VMInstanceVO> NetworkTypeSearch;
protected GenericSearchBuilder<VMInstanceVO, String> DistinctHostNameSearch; protected GenericSearchBuilder<VMInstanceVO, String> DistinctHostNameSearch;
@ -231,11 +231,11 @@ public class VMInstanceDaoImpl extends GenericDaoBase<VMInstanceVO, Long> implem
FindIdsOfVirtualRoutersByAccount.and("state", FindIdsOfVirtualRoutersByAccount.entity().getState(), SearchCriteria.Op.NIN); FindIdsOfVirtualRoutersByAccount.and("state", FindIdsOfVirtualRoutersByAccount.entity().getState(), SearchCriteria.Op.NIN);
FindIdsOfVirtualRoutersByAccount.done(); FindIdsOfVirtualRoutersByAccount.done();
CountRunningByHost = createSearchBuilder(Long.class); CountActiveByHost = createSearchBuilder(Long.class);
CountRunningByHost.select(null, Func.COUNT, null); CountActiveByHost.select(null, Func.COUNT, null);
CountRunningByHost.and("host", CountRunningByHost.entity().getHostId(), SearchCriteria.Op.EQ); CountActiveByHost.and("host", CountActiveByHost.entity().getHostId(), SearchCriteria.Op.EQ);
CountRunningByHost.and("state", CountRunningByHost.entity().getState(), SearchCriteria.Op.EQ); CountActiveByHost.and("state", CountActiveByHost.entity().getState(), SearchCriteria.Op.IN);
CountRunningByHost.done(); CountActiveByHost.done();
CountRunningByAccount = createSearchBuilder(Long.class); CountRunningByAccount = createSearchBuilder(Long.class);
CountRunningByAccount.select(null, Func.COUNT, null); CountRunningByAccount.select(null, Func.COUNT, null);
@ -530,10 +530,10 @@ public class VMInstanceDaoImpl extends GenericDaoBase<VMInstanceVO, Long> implem
} }
@Override @Override
public Long countRunningByHostId(long hostId) { public Long countActiveByHostId(long hostId) {
SearchCriteria<Long> sc = CountRunningByHost.create(); SearchCriteria<Long> sc = CountActiveByHost.create();
sc.setParameters("host", hostId); 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); return customSearch(sc, null).get(0);
} }

2
server/src/com/cloud/capacity/CapacityManagerImpl.java
View File

@ -1052,7 +1052,7 @@ public class CapacityManagerImpl extends ManagerBase implements CapacityManager,
@Override @Override
public boolean checkIfHostReachMaxGuestLimit(Host host) { public boolean checkIfHostReachMaxGuestLimit(Host host) {
Long vmCount = _vmDao.countRunningByHostId(host.getId()); Long vmCount = _vmDao.countActiveByHostId(host.getId());
HypervisorType hypervisorType = host.getHypervisorType(); HypervisorType hypervisorType = host.getHypervisorType();
String hypervisorVersion = host.getHypervisorVersion(); String hypervisorVersion = host.getHypervisorVersion();
Long maxGuestLimit = _hypervisorCapabilitiesDao.getMaxGuestsLimit(hypervisorType, hypervisorVersion); Long maxGuestLimit = _hypervisorCapabilitiesDao.getMaxGuestsLimit(hypervisorType, hypervisorVersion);