cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mtutkow...@apache.org
Subject git commit: updated refs/heads/master to 2960ba7
Date Fri, 25 Apr 2014 18:31:24 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 06bbcde45 -> 2960ba733


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/2960ba73
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2960ba73
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2960ba73

Branch: refs/heads/master
Commit: 2960ba733afcb6e8d056473475eb3e610d7250dc
Parents: 06bbcde
Author: Mike Tutkowski <mike.tutkowski@solidfire.com>
Authored: Thu Apr 24 22:18:56 2014 -0600
Committer: Mike Tutkowski <mike.tutkowski@solidfire.com>
Committed: Fri Apr 25 12:31:13 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/2960ba73/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


Mime
View raw message