Repository: cloudstack Updated Branches: refs/heads/4.4-forward a176576c3 -> 6dfa742eb
CLOUDSTACK-6170 Updated logic to more accurately calculate how much space is currently allocated for a managed storage pool Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6dfa742e Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6dfa742e Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6dfa742e Branch: refs/heads/4.4-forward Commit: 6dfa742eb8d6b775317829636bfa28f0ec297242 Parents: a176576 Author: Mike Tutkowski <mike.tutkow...@solidfire.com> Authored: Thu Apr 24 22:18:56 2014 -0600 Committer: Mike Tutkowski <mike.tutkow...@solidfire.com> Committed: Fri Apr 25 12:30:38 2014 -0600 ---------------------------------------------------------------------- server/src/com/cloud/capacity/CapacityManagerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6dfa742e/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 cef019d..14fbe7f 100755 --- a/server/src/com/cloud/capacity/CapacityManagerImpl.java +++ b/server/src/com/cloud/capacity/CapacityManagerImpl.java @@ -548,7 +548,7 @@ public class CapacityManagerImpl extends ManagerBase implements CapacityManager, // if the storage pool is managed, the used bytes can be larger than the sum of the sizes of all of the non-destroyed volumes // in this case, call getUsedBytes(StoragePoolVO) if (pool.isManaged()) { - totalAllocatedSize = getUsedBytes(pool); + return getUsedBytes(pool); } else { // Get size for all the non-destroyed volumes