cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject [1/2] git commit: updated refs/heads/4.4 to 1b1a417
Date Mon, 23 Jun 2014 07:52:55 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/4.4 c42293371 -> 1b1a417bb


CLOUDSTACK-6965: fixed the NullPointerException introduced by fix for cloudstack
6935 in AbstractStoragePoolAllocator#filter method for Zone Wide storage

(cherry picked from commit ef45f06f88c955dcf47f1fb69a3a0e87eb817e1d)


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/423c23af
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/423c23af
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/423c23af

Branch: refs/heads/4.4
Commit: 423c23af4052b29e908110d35978a4a720501448
Parents: c422933
Author: Anshul Gangwar <anshul.gangwar@citrix.com>
Authored: Mon Jun 23 10:58:44 2014 +0530
Committer: Daan Hoogland <daan@onecht.net>
Committed: Mon Jun 23 09:50:04 2014 +0200

----------------------------------------------------------------------
 .../allocator/AbstractStoragePoolAllocator.java     | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/423c23af/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;
         }


Mime
View raw message