CLOUDSTACK-3665:Failed to create volume from snapshot.

minchen07 · minchen07 · commit 13a9b9419301 · 2013-07-24T14:39:07.000-07:00
diff --git a/engine/storage/src/org/apache/cloudstack/storage/allocator/ClusterScopeStoragePoolAllocator.java b/engine/storage/src/org/apache/cloudstack/storage/allocator/ClusterScopeStoragePoolAllocator.java
@@ -59,9 +59,13 @@ protected List<StoragePool> select(DiskProfile dskCh, VirtualMachineProfile vmPr
         Long podId = plan.getPodId();
         Long clusterId = plan.getClusterId();
 
-		if (clusterId == null) {
-			return null;
-		}
+        if (podId == null) {
+            // for zone wide storage, podId should be null. We cannot check
+            // clusterId == null here because it will break ClusterWide primary
+            // storage volume operation where
+            // only podId is passed into this call.
+            return null;
+        }
         if (dskCh.getTags() != null && dskCh.getTags().length != 0) {
             s_logger.debug("Looking for pools in dc: " + dcId + "  pod:" + podId + "  cluster:" + clusterId
                     + " having tags:" + Arrays.toString(dskCh.getTags()));
diff --git a/engine/storage/src/org/apache/cloudstack/storage/allocator/LocalStoragePoolAllocator.java b/engine/storage/src/org/apache/cloudstack/storage/allocator/LocalStoragePoolAllocator.java
@@ -96,7 +96,8 @@ protected List<StoragePool> select(DiskProfile dskCh, VirtualMachineProfile vmPr
                 }
             }
         } else {
-            if (plan.getClusterId() == null) {
+            if (plan.getPodId() == null) {
+                // zone wide primary storage deployment
                 return null;
             }
             List<StoragePoolVO> availablePools = _storagePoolDao.findLocalStoragePoolsByTags(plan.getDataCenterId(),
diff --git a/plugins/storage-allocators/random/src/org/apache/cloudstack/storage/allocator/RandomStoragePoolAllocator.java b/plugins/storage-allocators/random/src/org/apache/cloudstack/storage/allocator/RandomStoragePoolAllocator.java
@@ -47,7 +47,7 @@ public List<StoragePool> select(DiskProfile dskCh, VirtualMachineProfile vmProfi
         Long podId = plan.getPodId();
         Long clusterId = plan.getClusterId();
 
-		if (clusterId == null) {
+		if (podId == null) {
 			return null;
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,8 @@ protected List<StoragePool> select(DiskProfile dskCh, VirtualMachineProfile vmPr`
`96`	`96`	`}`
`97`	`97`	`}`
`98`	`98`	`} else {`
`99`		`- if (plan.getClusterId() == null) {`
	`99`	`+ if (plan.getPodId() == null) {`
	`100`	`+ // zone wide primary storage deployment`
`100`	`101`	`return null;`
`101`	`102`	`}`
`102`	`103`	`List<StoragePoolVO> availablePools = _storagePoolDao.findLocalStoragePoolsByTags(plan.getDataCenterId(),`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public List<StoragePool> select(DiskProfile dskCh, VirtualMachineProfile vmProfi`
`47`	`47`	`Long podId = plan.getPodId();`
`48`	`48`	`Long clusterId = plan.getClusterId();`
`49`	`49`
`50`		`- if (clusterId == null) {`
	`50`	`+ if (podId == null) {`
`51`	`51`	`return null;`
`52`	`52`	`}`
`53`	`53`