etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug 10205: download user upload template for each local secondary storage 

status 10205: resolved fixed
This commit is contained in:
Edison Su 2011-06-15 16:41:51 -04:00
parent 1fa00d14b1
commit 83f0623f30
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
server/src/com/cloud/storage/download/DownloadMonitorImpl.java
View File

@ -527,7 +527,7 @@ public class DownloadMonitorImpl implements DownloadMonitor {
return null;
}
private List<VMTemplateVO> listAllInZone(long dcId){
private List<VMTemplateVO> listAllInZone(long dcId, HostVO ssHost){
List<VMTemplateVO> tmplts = _templateDao.listAllInZone(dcId);
Iterator<VMTemplateVO> iter = tmplts.iterator();
while ( iter.hasNext() ) {
@ -538,8 +538,15 @@ public class DownloadMonitorImpl implements DownloadMonitor {
List<VMTemplateHostVO> tmpltHosts = _vmTemplateHostDao.listByZoneTemplate(dcId, tmplt.getId(), false);
for ( VMTemplateHostVO tmpltHost : tmpltHosts ) {
if ( tmpltHost.getDownloadState() == Status.DOWNLOADED || tmpltHost.getDownloadState() == Status.DOWNLOAD_IN_PROGRESS) {
iter.remove();
break;
if (ssHost.getType() == Host.Type.LocalSecondaryStorage) {
if (tmpltHost.getHostId() == ssHost.getId()) {
iter.remove();
break;
}
} else {
iter.remove();
break;
}
}
}
}
@ -564,7 +571,7 @@ public class DownloadMonitorImpl implements DownloadMonitor {
long zoneId = ssHost.getDataCenterId();
Set<VMTemplateVO> toBeDownloaded = new HashSet<VMTemplateVO>();
List<VMTemplateVO> allTemplates = listAllInZone(ssHost.getDataCenterId());
List<VMTemplateVO> allTemplates = listAllInZone(ssHost.getDataCenterId(), ssHost);
List<VMTemplateVO> rtngTmplts = _templateDao.listAllSystemVMTemplates();
List<VMTemplateVO> defaultBuiltin = _templateDao.listDefaultBuiltinTemplates();