cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From raj...@apache.org
Subject [1/3] git commit: updated refs/heads/master to 2aeca0d
Date Tue, 14 Feb 2017 09:15:50 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 2a2f0cb53 -> 2aeca0d34


CLOUDSTACK-8896: allocated percentage of storage pool going beyond 100%

This issue occurs when a volume in Ready state is moved across storage
pools.

While finding if the storage pool has enough space, it has a check to
consider the size of non Ready volumes only. This is true if the volume
to be attached to a vm is in the same storage pool. But, if the volume
is in another storage pool and has to be moved to a vm's storage pool,
the size of the volume should be considered in doing the space check.

computing the asking size when volume is not in ready state or when the
volume is on a different storage pool.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/bec9115a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/bec9115a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/bec9115a

Branch: refs/heads/master
Commit: bec9115a617ecac27e5b5785c8e838a535764f7d
Parents: 01e78f9
Author: Rajani Karuturi <rajani.karuturi@accelerite.com>
Authored: Thu Nov 3 10:52:44 2016 +0530
Committer: Rajani Karuturi <rajani.karuturi@accelerite.com>
Committed: Mon Feb 13 15:27:11 2017 +0530

----------------------------------------------------------------------
 server/src/com/cloud/storage/StorageManagerImpl.java | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bec9115a/server/src/com/cloud/storage/StorageManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/StorageManagerImpl.java b/server/src/com/cloud/storage/StorageManagerImpl.java
index c0dda25..a5ffbb0 100644
--- a/server/src/com/cloud/storage/StorageManagerImpl.java
+++ b/server/src/com/cloud/storage/StorageManagerImpl.java
@@ -1719,6 +1719,9 @@ public class StorageManagerImpl extends ManagerBase implements StorageManager,
C
         }
 
         // allocated space includes templates
+        if(s_logger.isDebugEnabled()) {
+            s_logger.debug("Destination pool id: " + pool.getId());
+        }
         StoragePoolVO poolVO = _storagePoolDao.findById(pool.getId());
         long allocatedSizeWithTemplate = _capacityMgr.getAllocatedPoolCapacity(poolVO, null);
         long totalAskingSize = 0;
@@ -1746,10 +1749,12 @@ public class StorageManagerImpl extends ManagerBase implements StorageManager,
C
                     allocatedSizeWithTemplate = _capacityMgr.getAllocatedPoolCapacity(poolVO,
tmpl);
                 }
             }
-
-            if (volumeVO.getState() != Volume.State.Ready) {
-                totalAskingSize += getDataObjectSizeIncludingHypervisorSnapshotReserve(volumeVO,
pool);
-
+            // A ready state volume is already allocated in a pool. so the asking size is
zero for it.
+            // In case the volume is moving across pools or is not ready yet, the asking
size has to be computed
+            if (s_logger.isDebugEnabled()) {
+                s_logger.debug("pool id for the volume with id: " + volumeVO.getId() + "
is " + volumeVO.getPoolId());
+            }
+            if ((volumeVO.getState() != Volume.State.Ready) || (volumeVO.getPoolId() != pool.getId()))
{
                 if (ScopeType.ZONE.equals(poolVO.getScope()) && volumeVO.getTemplateId()
!= null) {
                     VMTemplateVO tmpl = _templateDao.findByIdIncludingRemoved(volumeVO.getTemplateId());
 


Mime
View raw message