You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by wi...@apache.org on 2013/08/27 17:05:51 UTC
[1/2] git commit: updated refs/heads/master to 79c366d
Updated Branches:
refs/heads/4.2-forward f70183171 -> 3315159de
refs/heads/master 358c6e371 -> 79c366db2
CLOUDSTACK-1191: Re-enable deployment of SystemVMs on RBD
This was reverted by 0a5228922b822b57af72249912ed854281e1d85a unintentionnaly
but broke this feature for RBD.
Enable SystemVM deployment on RBD again
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/79c366db
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/79c366db
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/79c366db
Branch: refs/heads/master
Commit: 79c366db2b14f66d830834d5d117aff3be2bcebb
Parents: 358c6e3
Author: Wido den Hollander <wi...@widodh.nl>
Authored: Tue Aug 27 17:03:56 2013 +0200
Committer: Wido den Hollander <wi...@widodh.nl>
Committed: Tue Aug 27 17:05:08 2013 +0200
----------------------------------------------------------------------
.../storage/allocator/AbstractStoragePoolAllocator.java | 8 --------
1 file changed, 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/79c366db/engine/storage/src/org/apache/cloudstack/storage/allocator/AbstractStoragePoolAllocator.java
----------------------------------------------------------------------
diff --git a/engine/storage/src/org/apache/cloudstack/storage/allocator/AbstractStoragePoolAllocator.java b/engine/storage/src/org/apache/cloudstack/storage/allocator/AbstractStoragePoolAllocator.java
index 9d5d7a4..81800c6 100755
--- a/engine/storage/src/org/apache/cloudstack/storage/allocator/AbstractStoragePoolAllocator.java
+++ b/engine/storage/src/org/apache/cloudstack/storage/allocator/AbstractStoragePoolAllocator.java
@@ -183,14 +183,6 @@ public abstract class AbstractStoragePoolAllocator extends AdapterBase implement
return false;
}
-
- DiskOfferingVO diskOffering = _diskOfferingDao.findById(dskCh.getDiskOfferingId());
- if (diskOffering.getSystemUse() && pool.getPoolType() == StoragePoolType.RBD) {
- s_logger.debug("Skipping RBD pool " + pool.getName()
- + " as a suitable pool. RBD is not supported for System VM's");
- return false;
- }
-
Long clusterId = pool.getClusterId();
ClusterVO cluster = _clusterDao.findById(clusterId);
if (!(cluster.getHypervisorType() == dskCh.getHypervisorType())) {
[2/2] git commit: updated refs/heads/4.2-forward to 3315159
Posted by wi...@apache.org.
CLOUDSTACK-1191: Re-enable deployment of SystemVMs on RBD
This was reverted by 0a5228922b822b57af72249912ed854281e1d85a unintentionnaly
but broke this feature for RBD.
Enable SystemVM deployment on RBD again
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3315159d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3315159d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3315159d
Branch: refs/heads/4.2-forward
Commit: 3315159de62620166c119dbf72dad9cf661cc0cb
Parents: f701831
Author: Wido den Hollander <wi...@widodh.nl>
Authored: Tue Aug 27 17:03:56 2013 +0200
Committer: Wido den Hollander <wi...@widodh.nl>
Committed: Tue Aug 27 17:05:38 2013 +0200
----------------------------------------------------------------------
.../storage/allocator/AbstractStoragePoolAllocator.java | 8 --------
1 file changed, 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3315159d/engine/storage/src/org/apache/cloudstack/storage/allocator/AbstractStoragePoolAllocator.java
----------------------------------------------------------------------
diff --git a/engine/storage/src/org/apache/cloudstack/storage/allocator/AbstractStoragePoolAllocator.java b/engine/storage/src/org/apache/cloudstack/storage/allocator/AbstractStoragePoolAllocator.java
index 89e0974..e5a1d8b 100755
--- a/engine/storage/src/org/apache/cloudstack/storage/allocator/AbstractStoragePoolAllocator.java
+++ b/engine/storage/src/org/apache/cloudstack/storage/allocator/AbstractStoragePoolAllocator.java
@@ -183,14 +183,6 @@ public abstract class AbstractStoragePoolAllocator extends AdapterBase implement
return false;
}
-
- DiskOfferingVO diskOffering = _diskOfferingDao.findById(dskCh.getDiskOfferingId());
- if (diskOffering.getSystemUse() && pool.getPoolType() == StoragePoolType.RBD) {
- s_logger.debug("Skipping RBD pool " + pool.getName()
- + " as a suitable pool. RBD is not supported for System VM's");
- return false;
- }
-
Long clusterId = pool.getClusterId();
ClusterVO cluster = _clusterDao.findById(clusterId);
if (!(cluster.getHypervisorType() == dskCh.getHypervisorType())) {