Remove root volume filtering logic for iSCSI storage since iSCSI storage (SolidFire storage) can handle root volume
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/51cfff41 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/51cfff41 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/51cfff41 Branch: refs/heads/remove-root-disk-filtering-logic-for-iscsi-storage Commit: 51cfff41aa175e0d03ed9d5cc26dad4804cc9e48 Parents: e5e142f Author: ynojima <m...@ynojima.net> Authored: Fri Jun 27 02:15:36 2014 -0600 Committer: ynojima <m...@ynojima.net> Committed: Fri Jun 27 02:15:36 2014 -0600 ---------------------------------------------------------------------- .../storage/allocator/AbstractStoragePoolAllocator.java | 9 --------- 1 file changed, 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51cfff41/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 847bad3..98a6acf 100755 --- a/engine/storage/src/org/apache/cloudstack/storage/allocator/AbstractStoragePoolAllocator.java +++ b/engine/storage/src/org/apache/cloudstack/storage/allocator/AbstractStoragePoolAllocator.java @@ -38,11 +38,9 @@ import com.cloud.dc.ClusterVO; import com.cloud.dc.dao.ClusterDao; import com.cloud.deploy.DeploymentPlan; import com.cloud.deploy.DeploymentPlanner.ExcludeList; -import com.cloud.storage.Storage.StoragePoolType; import com.cloud.storage.StorageManager; import com.cloud.storage.StoragePool; import com.cloud.storage.Volume; -import com.cloud.storage.Volume.Type; import com.cloud.storage.dao.DiskOfferingDao; import com.cloud.storage.dao.VolumeDao; import com.cloud.user.Account; @@ -164,13 +162,6 @@ public abstract class AbstractStoragePoolAllocator extends AdapterBase implement return false; } - if (dskCh.getType().equals(Type.ROOT) && pool.getPoolType().equals(StoragePoolType.Iscsi)) { - if (s_logger.isDebugEnabled()) { - s_logger.debug("Disk needed for ROOT volume, but StoragePoolType is Iscsi, skipping this and trying other available pools"); - } - return false; - } - Long clusterId = pool.getClusterId(); if (clusterId != null) { ClusterVO cluster = _clusterDao.findById(clusterId);
