You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2015/05/07 16:05:18 UTC
[40/50] [abbrv] git commit: updated refs/heads/master to 1c408de
CLOUDSTACK-8438: Proper enforcement of hypervisor capability "max. guest limit"
VMs in transition states - Starting, Stopping, Migrating - are also taken into account for enforcing "max. guest limit"
(cherry picked from commit 3100fc15544bd5bdbe8d2eb0a0e429355657b910)
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/23bde8ea
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/23bde8ea
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/23bde8ea
Branch: refs/heads/master
Commit: 23bde8ea7af70876592c87c7580eed35ef3a89f0
Parents: cb3d03c
Author: Koushik Das <ko...@apache.org>
Authored: Fri May 1 12:46:24 2015 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Sun May 3 15:56:10 2015 +0200
----------------------------------------------------------------------
.../src/com/cloud/vm/dao/VMInstanceDao.java | 2 +-
.../src/com/cloud/vm/dao/VMInstanceDaoImpl.java | 18 +++++++++---------
.../com/cloud/capacity/CapacityManagerImpl.java | 2 +-
3 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/23bde8ea/engine/schema/src/com/cloud/vm/dao/VMInstanceDao.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/vm/dao/VMInstanceDao.java b/engine/schema/src/com/cloud/vm/dao/VMInstanceDao.java
index 1e4c8b6..1d522dc 100644
--- 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);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/23bde8ea/engine/schema/src/com/cloud/vm/dao/VMInstanceDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/vm/dao/VMInstanceDaoImpl.java b/engine/schema/src/com/cloud/vm/dao/VMInstanceDaoImpl.java
index 3eabbdb..be0e366 100644
--- 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 @@ public class VMInstanceDaoImpl extends GenericDaoBase<VMInstanceVO, Long> implem
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 class VMInstanceDaoImpl extends GenericDaoBase<VMInstanceVO, Long> implem
}
@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);
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/23bde8ea/server/src/com/cloud/capacity/CapacityManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/capacity/CapacityManagerImpl.java b/server/src/com/cloud/capacity/CapacityManagerImpl.java
index 3c49099..f91a20a 100755
--- a/server/src/com/cloud/capacity/CapacityManagerImpl.java
+++ b/server/src/com/cloud/capacity/CapacityManagerImpl.java
@@ -1055,7 +1055,7 @@ public class CapacityManagerImpl extends ManagerBase implements CapacityManager,
@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);