Fixing an issue in the AbstractStoragePoolAllocator's filter method where zone-wide storage of HypervisorType.Any is skipped
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/62c18ca3 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/62c18ca3 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/62c18ca3 Branch: refs/heads/vpc-toolkit-hugo Commit: 62c18ca3fa332846071da1e59639136efd378a47 Parents: 8303490 Author: Mike Tutkowski <[email protected]> Authored: Mon Jul 7 15:38:06 2014 -0600 Committer: Mike Tutkowski <[email protected]> Committed: Mon Jul 7 22:16:58 2014 -0600 ---------------------------------------------------------------------- .../storage/allocator/AbstractStoragePoolAllocator.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/62c18ca3/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 98a6acf..d3df356 100755 --- a/engine/storage/src/org/apache/cloudstack/storage/allocator/AbstractStoragePoolAllocator.java +++ b/engine/storage/src/org/apache/cloudstack/storage/allocator/AbstractStoragePoolAllocator.java @@ -38,6 +38,7 @@ 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.hypervisor.Hypervisor.HypervisorType; import com.cloud.storage.StorageManager; import com.cloud.storage.StoragePool; import com.cloud.storage.Volume; @@ -171,7 +172,7 @@ public abstract class AbstractStoragePoolAllocator extends AdapterBase implement } return false; } - } else if (pool.getHypervisor() != null && !(pool.getHypervisor() == dskCh.getHypervisorType())) { + } else if (pool.getHypervisor() != null && !pool.getHypervisor().equals(HypervisorType.Any) && !(pool.getHypervisor() == dskCh.getHypervisorType())) { if (s_logger.isDebugEnabled()) { s_logger.debug("StoragePool does not have required hypervisorType, skipping this pool"); }
