From 24af28290ec3ea6a18c66544dbfd8678d6f7d19b Mon Sep 17 00:00:00 2001 From: Min Chen Date: Fri, 1 Nov 2013 18:06:25 -0700 Subject: [PATCH] CLOUDSTACK-5017: use LocalHostEndPoint in copying from S3 to cache store during ssvm launch. --- .../storage/endpoint/DefaultEndPointSelector.java | 10 ++++++++++ 1 file changed, 10 insertions(+) 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 22df4636d78..ce83790a4f5 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);