You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by yn...@apache.org on 2014/07/02 04:55:50 UTC
[1/2] git commit: updated refs/heads/master to 1e72e5a
Repository: cloudstack
Updated Branches:
refs/heads/master 890e71cb5 -> 1e72e5a81
Revert "Fixing an issue introduced with Review Request 22717"
This reverts commit 12e92e10ffbd9f86ebff11c2a1b22c5bafafb3d1.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/32ed9d86
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/32ed9d86
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/32ed9d86
Branch: refs/heads/master
Commit: 32ed9d86ecafc143696e0c69883f8b7d56a94e55
Parents: 890e71c
Author: ynojima <ma...@ynojima.net>
Authored: Tue Jul 1 19:54:11 2014 -0600
Committer: ynojima <ma...@ynojima.net>
Committed: Tue Jul 1 19:54:11 2014 -0600
----------------------------------------------------------------------
.../storage/allocator/ZoneWideStoragePoolAllocator.java | 11 -----------
1 file changed, 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/32ed9d86/engine/storage/src/org/apache/cloudstack/storage/allocator/ZoneWideStoragePoolAllocator.java
----------------------------------------------------------------------
diff --git a/engine/storage/src/org/apache/cloudstack/storage/allocator/ZoneWideStoragePoolAllocator.java b/engine/storage/src/org/apache/cloudstack/storage/allocator/ZoneWideStoragePoolAllocator.java
index 8246a80..f9abfde 100644
--- a/engine/storage/src/org/apache/cloudstack/storage/allocator/ZoneWideStoragePoolAllocator.java
+++ b/engine/storage/src/org/apache/cloudstack/storage/allocator/ZoneWideStoragePoolAllocator.java
@@ -34,7 +34,6 @@ import com.cloud.deploy.DeploymentPlan;
import com.cloud.deploy.DeploymentPlanner.ExcludeList;
import com.cloud.hypervisor.Hypervisor.HypervisorType;
import com.cloud.storage.StoragePool;
-import com.cloud.storage.Volume;
import com.cloud.user.Account;
import com.cloud.vm.DiskProfile;
import com.cloud.vm.VirtualMachineProfile;
@@ -102,16 +101,6 @@ public class ZoneWideStoragePoolAllocator extends AbstractStoragePoolAllocator {
}
@Override
- protected boolean filter(ExcludeList avoid, StoragePool pool, DiskProfile dskCh, DeploymentPlan plan) {
- Volume volume = _volumeDao.findById(dskCh.getVolumeId());
- List<Volume> requestVolumes = new ArrayList<Volume>();
-
- requestVolumes.add(volume);
-
- return storageMgr.storagePoolHasEnoughIops(requestVolumes, pool) && storageMgr.storagePoolHasEnoughSpace(requestVolumes, pool);
- }
-
- @Override
protected List<StoragePool> reorderPoolsByNumberOfVolumes(DeploymentPlan plan, List<StoragePool> pools, Account account) {
if (account == null) {
return pools;
[2/2] git commit: updated refs/heads/master to 1e72e5a
Posted by yn...@apache.org.
CLOUDSTACK-6935 remove iSCSI storage filtering logic for Root volume
since there is no reason to filter it out
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1e72e5a8
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1e72e5a8
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1e72e5a8
Branch: refs/heads/master
Commit: 1e72e5a818b7bcc738262a2b10794a17fbb0076b
Parents: 32ed9d8
Author: ynojima <ma...@ynojima.net>
Authored: Tue Jul 1 19:57:19 2014 -0600
Committer: ynojima <ma...@ynojima.net>
Committed: Tue Jul 1 19:57:19 2014 -0600
----------------------------------------------------------------------
.../storage/allocator/AbstractStoragePoolAllocator.java | 9 ---------
1 file changed, 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1e72e5a8/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);