Updated Branches: refs/heads/4.1 3128a4cce -> 775598665
CLOUDSTACK-3372: CapacityManager does not count destroyed volumes when deploy VMs Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e92c5b0d Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e92c5b0d Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e92c5b0d Branch: refs/heads/4.1 Commit: e92c5b0de865a60f7061910be3b040bdc62cf5f9 Parents: 3128a4c Author: Wei Zhou <[email protected]> Authored: Fri Jul 5 11:28:40 2013 +0200 Committer: Wei Zhou <[email protected]> Committed: Fri Jul 5 11:28:40 2013 +0200 ---------------------------------------------------------------------- server/src/com/cloud/capacity/CapacityManagerImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e92c5b0d/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 d7b7053..843587a 100755 --- a/server/src/com/cloud/capacity/CapacityManagerImpl.java +++ b/server/src/com/cloud/capacity/CapacityManagerImpl.java @@ -440,8 +440,8 @@ public class CapacityManagerImpl extends ManagerBase implements CapacityManager, @Override public long getAllocatedPoolCapacity(StoragePoolVO pool, VMTemplateVO templateForVmCreation){ - // Get size for all the volumes - Pair<Long, Long> sizes = _volumeDao.getCountAndTotalByPool(pool.getId()); + // Get size for all the non-destroyed volumes + Pair<Long, Long> sizes = _volumeDao.getNonDestroyedCountAndTotalByPool(pool.getId()); long totalAllocatedSize = sizes.second() + sizes.first() * _extraBytesPerVolume; // Iterate through all templates on this storage pool
