Updated Branches: refs/heads/object_store 863b53406 -> c609bc054
Fix a bug in attachIsoToVM for S3. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9e1a9bfd Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9e1a9bfd Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9e1a9bfd Branch: refs/heads/object_store Commit: 9e1a9bfd4b33fada025f8776ee29001b034defda Parents: 863b534 Author: Min Chen <[email protected]> Authored: Fri May 24 14:24:23 2013 -0700 Committer: Min Chen <[email protected]> Committed: Fri May 24 14:24:23 2013 -0700 ---------------------------------------------------------------------- .../com/cloud/template/TemplateManagerImpl.java | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9e1a9bfd/server/src/com/cloud/template/TemplateManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/template/TemplateManagerImpl.java b/server/src/com/cloud/template/TemplateManagerImpl.java index 495e8e5..ac66312 100755 --- a/server/src/com/cloud/template/TemplateManagerImpl.java +++ b/server/src/com/cloud/template/TemplateManagerImpl.java @@ -1064,17 +1064,10 @@ public class TemplateManagerImpl extends ManagerBase implements TemplateManager, return false; } if (tmplt.getDataStore() != null && !(tmplt.getDataStore().getTO() instanceof NfsTO)) { - String value = _configDao.getValue(Config.PrimaryStorageDownloadWait.toString()); - int _primaryStorageDownloadWait = NumbersUtil.parseInt(value, Integer.parseInt(Config.PrimaryStorageDownloadWait.getDefaultValue())); // if it is s3, need to download into cache storage first Scope destScope = new ZoneScope(vm.getDataCenterId()); TemplateInfo cacheData = (TemplateInfo) cacheMgr.createCacheObject(tmplt, destScope); - CopyCommand cmd = new CopyCommand(tmplt.getTO(), cacheData.getTO(), _primaryStorageDownloadWait); - EndPoint ep = selector.select(tmplt, cacheData); - Answer answer = ep.sendMessage(cmd); - if (answer != null && answer.getResult()) { - tmplt = cacheData; - } else { + if (cacheData == null){ s_logger.error("Failed in copy iso from S3 to cache storage"); return false; }
