CLOUDSTACK-6046:CreateVolume from snapshot is failing with S3 as

minchen07 · chaturvedia · commit 3cd9dee1db21 · 2014-02-07T13:24:48.000-08:00
secondary storage and zone-wide primary storage.(cherry picked from commit 900c511) Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
diff --git a/engine/storage/datamotion/src/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java b/engine/storage/datamotion/src/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java
@@ -249,7 +249,7 @@ protected Answer copyVolumeFromSnapshot(DataObject snapObj, DataObject volObj) {
             if (srcData.getDataStore().getRole() == DataStoreRole.Primary) {
                 ep = selector.select(volObj);
             } else {
-                ep = selector.select(snapObj, volObj);
+                ep = selector.select(srcData, volObj);
             }
 
             CopyCommand cmd = new CopyCommand(srcData.getTO(), volObj.getTO(), _createVolumeFromSnapshotWait, VirtualMachineManager.ExecuteInSequence.value());
diff --git a/engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java b/engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java
@@ -167,10 +167,11 @@ protected EndPoint findEndPointForImageMove(DataStore srcStore, DataStore destSt
             poolId = destStore.getId();
         } else {
             // if both are zone scope
-            selectedScope = srcScope;
             if (srcStore.getRole() == DataStoreRole.Primary) {
+                selectedScope = srcScope;
                 poolId = srcStore.getId();
             } else if (destStore.getRole() == DataStoreRole.Primary) {
+                selectedScope = destScope;
                 poolId = destStore.getId();
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -249,7 +249,7 @@ protected Answer copyVolumeFromSnapshot(DataObject snapObj, DataObject volObj) {`
`249`	`249`	`if (srcData.getDataStore().getRole() == DataStoreRole.Primary) {`
`250`	`250`	`ep = selector.select(volObj);`
`251`	`251`	`} else {`
`252`		`- ep = selector.select(snapObj, volObj);`
	`252`	`+ ep = selector.select(srcData, volObj);`
`253`	`253`	`}`
`254`	`254`
`255`	`255`	`CopyCommand cmd = new CopyCommand(srcData.getTO(), volObj.getTO(), _createVolumeFromSnapshotWait, VirtualMachineManager.ExecuteInSequence.value());`
Original file line number	Diff line number	Diff line change
`@@ -167,10 +167,11 @@ protected EndPoint findEndPointForImageMove(DataStore srcStore, DataStore destSt`
`167`	`167`	`poolId = destStore.getId();`
`168`	`168`	`} else {`
`169`	`169`	`// if both are zone scope`
`170`		`- selectedScope = srcScope;`
`171`	`170`	`if (srcStore.getRole() == DataStoreRole.Primary) {`
	`171`	`+ selectedScope = srcScope;`
`172`	`172`	`poolId = srcStore.getId();`
`173`	`173`	`} else if (destStore.getRole() == DataStoreRole.Primary) {`
	`174`	`+ selectedScope = destScope;`
`174`	`175`	`poolId = destStore.getId();`
`175`	`176`	`}`
`176`	`177`	`}`