You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by de...@apache.org on 2014/06/23 08:39:42 UTC
git commit: updated refs/heads/4.4-forward to ef45f06
Repository: cloudstack
Updated Branches:
refs/heads/4.4-forward c690320f0 -> ef45f06f8
CLOUDSTACK-6965: fixed the NullPointerException introduced by fix for cloudstack
6935 in AbstractStoragePoolAllocator#filter method for Zone Wide storage
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ef45f06f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ef45f06f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ef45f06f
Branch: refs/heads/4.4-forward
Commit: ef45f06f88c955dcf47f1fb69a3a0e87eb817e1d
Parents: c690320
Author: Anshul Gangwar <an...@citrix.com>
Authored: Mon Jun 23 10:58:44 2014 +0530
Committer: Devdeep Singh <de...@gmail.com>
Committed: Mon Jun 23 12:11:32 2014 +0530
----------------------------------------------------------------------
.../allocator/AbstractStoragePoolAllocator.java | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ef45f06f/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 2d958a6..847bad3 100755
--- a/engine/storage/src/org/apache/cloudstack/storage/allocator/AbstractStoragePoolAllocator.java
+++ b/engine/storage/src/org/apache/cloudstack/storage/allocator/AbstractStoragePoolAllocator.java
@@ -27,11 +27,12 @@ import java.util.Random;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager;
import org.apache.cloudstack.engine.subsystem.api.storage.StoragePoolAllocator;
import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
-import org.apache.log4j.Logger;
import com.cloud.dc.ClusterVO;
import com.cloud.dc.dao.ClusterDao;
@@ -171,10 +172,17 @@ public abstract class AbstractStoragePoolAllocator extends AdapterBase implement
}
Long clusterId = pool.getClusterId();
- ClusterVO cluster = _clusterDao.findById(clusterId);
- if (!(cluster.getHypervisorType() == dskCh.getHypervisorType())) {
+ if (clusterId != null) {
+ ClusterVO cluster = _clusterDao.findById(clusterId);
+ if (!(cluster.getHypervisorType() == dskCh.getHypervisorType())) {
+ if (s_logger.isDebugEnabled()) {
+ s_logger.debug("StoragePool's Cluster does not have required hypervisorType, skipping this pool");
+ }
+ return false;
+ }
+ } else if (pool.getHypervisor() != null && !(pool.getHypervisor() == dskCh.getHypervisorType())) {
if (s_logger.isDebugEnabled()) {
- s_logger.debug("StoragePool's Cluster does not have required hypervisorType, skipping this pool");
+ s_logger.debug("StoragePool does not have required hypervisorType, skipping this pool");
}
return false;
}