You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ra...@apache.org on 2017/02/14 09:16:04 UTC
[1/2] git commit: updated refs/heads/4.9 to abd7860
Repository: cloudstack
Updated Branches:
refs/heads/4.9 01e78f980 -> abd7860e6
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/4.9
Commit: bec9115a617ecac27e5b5785c8e838a535764f7d
Parents: 01e78f9
Author: Rajani Karuturi <ra...@accelerite.com>
Authored: Thu Nov 3 10:52:44 2016 +0530
Committer: Rajani Karuturi <ra...@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());
[2/2] git commit: updated refs/heads/4.9 to abd7860
Posted by ra...@apache.org.
Merge pull request #873 from karuturi/CLOUDSTACK-8896
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.
Testing:
I couldnt write unittests for it. This class is not in a unittestable state.
manually tested in the below environment
1. xenserver 6.5 setup with 2 clusters and a host each in each of them.
2. added storage tags for the primary storage.
3. created two service offerings with the storage tags.
4. deployed two vms using newly created offerings in step 3.
5. at this stage, there are two vms one on each host with root disks on the corresponding primary.
6. create a data disk and attach it to vm1
7. detach the data disk. now the data disk is in the primary storage of the cluster of vm1 (let us say primary1)
8. attach this data disk to vm2(running on a host in different cluster)
9. the volume should be moved to the primary storage of another cluster and op_host_capacity should be accordingly updated.
* pr/873:
CLOUDSTACK-8896: allocated percentage of storage pool going beyond 100%
Signed-off-by: Rajani Karuturi <ra...@accelerite.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/abd7860e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/abd7860e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/abd7860e
Branch: refs/heads/4.9
Commit: abd7860e68f3465f4c79fed657f27ef1737b92f1
Parents: 01e78f9 bec9115
Author: Rajani Karuturi <ra...@accelerite.com>
Authored: Tue Feb 14 14:43:36 2017 +0530
Committer: Rajani Karuturi <ra...@accelerite.com>
Committed: Tue Feb 14 14:43:36 2017 +0530
----------------------------------------------------------------------
server/src/com/cloud/storage/StorageManagerImpl.java | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
----------------------------------------------------------------------