apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-03 04:12:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix a bug in attachIsoToVM for S3.

Browse Source
This commit is contained in:
Min Chen 2013-05-24 14:24:23 -07:00
parent 863b534066
commit 9e1a9bfd4b
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
server/src/com/cloud/template/TemplateManagerImpl.java
View File

@ -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;
}