Updated Branches: refs/heads/master c2e2f6ce6 -> 24af28290
CLOUDSTACK-5017: use LocalHostEndPoint in copying from S3 to cache store during ssvm launch. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/24af2829 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/24af2829 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/24af2829 Branch: refs/heads/master Commit: 24af28290ec3ea6a18c66544dbfd8678d6f7d19b Parents: 6eecb0b Author: Min Chen <[email protected]> Authored: Fri Nov 1 18:06:25 2013 -0700 Committer: Min Chen <[email protected]> Committed: Fri Nov 1 18:07:00 2013 -0700 ---------------------------------------------------------------------- .../storage/endpoint/DefaultEndPointSelector.java | 10 ++++++++++ 1 file changed, 10 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/24af2829/engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java ---------------------------------------------------------------------- diff --git a/engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java b/engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java index 22df463..ce83790 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java +++ b/engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java @@ -187,6 +187,16 @@ public class DefaultEndPointSelector implements EndPointSelector { selectedStore = destStore; } EndPoint ep = findEndpointForImageStorage(selectedStore); + if (ep != null) { + return ep; + } + // handle special case where it is used in deploying ssvm for S3 + if (srcData instanceof TemplateInfo) { + TemplateInfo tmpl = (TemplateInfo)srcData; + if (tmpl.getTemplateType() == TemplateType.SYSTEM) { + ep = LocalHostEndpoint.getEndpoint(); + } + } return ep; } else if (moveBetweenImages(srcStore, destStore)) { EndPoint ep = findEndpointForImageStorage(destStore);
