apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Extract a common routine to associate template to zones in

Browse Source 
template_zone_ref table.
This commit is contained in:
Min Chen 2013-04-11 10:20:58 -07:00
parent 02686583cf
commit dcbeea057b
1 changed files with 27 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -922,26 +922,7 @@ public class DownloadMonitorImpl extends ManagerBase implements DownloadMonitor
tmpltStore.setSize(tmpltInfo.getSize()); tmpltStore.setSize(tmpltInfo.getSize());
tmpltStore.setPhysicalSize(tmpltInfo.getPhysicalSize()); tmpltStore.setPhysicalSize(tmpltInfo.getPhysicalSize());
_vmTemplateStoreDao.persist(tmpltStore); _vmTemplateStoreDao.persist(tmpltStore);
List<Long> dcs = new ArrayList<Long>(); this.associateTemplateToZone(tmplt.getId(), zoneId);
if (zoneId != null ){
dcs.add(zoneId);
}
else{
List<DataCenterVO> zones = _dcDao.listAll();
for (DataCenterVO zone : zones){
dcs.add(zone.getId());
}
}
for (Long id : dcs) {
VMTemplateZoneVO tmpltZoneVO = _vmTemplateZoneDao.findByZoneTemplate(id, tmplt.getId());
if (tmpltZoneVO == null) {
tmpltZoneVO = new VMTemplateZoneVO(id, tmplt.getId(), new Date());
_vmTemplateZoneDao.persist(tmpltZoneVO);
} else {
tmpltZoneVO.setLastUpdated(new Date());
_vmTemplateZoneDao.update(tmpltZoneVO.getId(), tmpltZoneVO);
}
}
} }
continue; continue;
@ -953,26 +934,7 @@ public class DownloadMonitorImpl extends ManagerBase implements DownloadMonitor
s_logger.info("Template Sync did not find " + uniqueName + " on the server " + storeId + ", will request download shortly"); s_logger.info("Template Sync did not find " + uniqueName + " on the server " + storeId + ", will request download shortly");
TemplateDataStoreVO templtStore = new TemplateDataStoreVO(storeId, tmplt.getId(), new Date(), 0, Status.NOT_DOWNLOADED, null, null, null, null, tmplt.getUrl()); TemplateDataStoreVO templtStore = new TemplateDataStoreVO(storeId, tmplt.getId(), new Date(), 0, Status.NOT_DOWNLOADED, null, null, null, null, tmplt.getUrl());
_vmTemplateStoreDao.persist(templtStore); _vmTemplateStoreDao.persist(templtStore);
List<Long> dcs = new ArrayList<Long>(); this.associateTemplateToZone(tmplt.getId(), zoneId);
if (zoneId != null ){
dcs.add(zoneId);
}
else{
List<DataCenterVO> zones = _dcDao.listAll();
for (DataCenterVO zone : zones){
dcs.add(zone.getId());
}
}
for (Long id : dcs) {
VMTemplateZoneVO tmpltZoneVO = _vmTemplateZoneDao.findByZoneTemplate(id, tmplt.getId());
if (tmpltZoneVO == null) {
tmpltZoneVO = new VMTemplateZoneVO(id, tmplt.getId(), new Date());
_vmTemplateZoneDao.persist(tmpltZoneVO);
} else {
tmpltZoneVO.setLastUpdated(new Date());
_vmTemplateZoneDao.update(tmpltZoneVO.getId(), tmpltZoneVO);
}
}
} }
} }
@ -1105,5 +1067,30 @@ public class DownloadMonitorImpl extends ManagerBase implements DownloadMonitor
} }
} }
// persist entry in template_zone_ref table. zoneId can be empty for region-wide image store, in that case,
// we will associate the template to all the zones.
private void associateTemplateToZone(long templateId, Long zoneId){
List<Long> dcs = new ArrayList<Long>();
if (zoneId != null ){
dcs.add(zoneId);
}
else{
List<DataCenterVO> zones = _dcDao.listAll();
for (DataCenterVO zone : zones){
dcs.add(zone.getId());
}
}
for (Long id : dcs) {
VMTemplateZoneVO tmpltZoneVO = _vmTemplateZoneDao.findByZoneTemplate(id, templateId);
if (tmpltZoneVO == null) {
tmpltZoneVO = new VMTemplateZoneVO(id, templateId, new Date());
_vmTemplateZoneDao.persist(tmpltZoneVO);
} else {
tmpltZoneVO.setLastUpdated(new Date());
_vmTemplateZoneDao.update(tmpltZoneVO.getId(), tmpltZoneVO);
}
}
}
} }