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

Fix some inaccurate logging message in template sync.

Browse Source
This commit is contained in:
Min Chen 2013-05-13 11:27:34 -07:00
parent ff735b4d81
commit c13a691429
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
engine/storage/image/src/org/apache/cloudstack/storage/image/TemplateServiceImpl.java
View File

@ -282,7 +282,7 @@ public class TemplateServiceImpl implements TemplateService {
TemplateProp tmpltInfo = templateInfos.remove(uniqueName); TemplateProp tmpltInfo = templateInfos.remove(uniqueName);
toBeDownloaded.remove(tmplt); toBeDownloaded.remove(tmplt);
if (tmpltStore != null) { if (tmpltStore != null) {
s_logger.info("Template Sync found " + uniqueName + " already in the template host table"); s_logger.info("Template Sync found " + uniqueName + " already in the image store");
if (tmpltStore.getDownloadState() != Status.DOWNLOADED) { if (tmpltStore.getDownloadState() != Status.DOWNLOADED) {
tmpltStore.setErrorString(""); tmpltStore.setErrorString("");
} }
@ -335,10 +335,10 @@ public class TemplateServiceImpl implements TemplateService {
continue; continue;
} }
if (tmpltStore != null && tmpltStore.getDownloadState() != Status.DOWNLOADED) { if (tmpltStore != null && tmpltStore.getDownloadState() != Status.DOWNLOADED) {
s_logger.info("Template Sync did not find " + uniqueName + " ready on server " + storeId + ", will request download to start/resume shortly"); s_logger.info("Template Sync did not find " + uniqueName + " ready on image store " + storeId + ", will request download to start/resume shortly");
} else if (tmpltStore == null) { } else if (tmpltStore == null) {
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 image store " + 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);
associateTemplateToZone(tmplt.getId(), zoneId); associateTemplateToZone(tmplt.getId(), zoneId);
@ -380,7 +380,6 @@ public class TemplateServiceImpl implements TemplateService {
continue; continue;
} }
s_logger.debug("Template " + tmplt.getName() + " needs to be downloaded to " + store.getName()); s_logger.debug("Template " + tmplt.getName() + " needs to be downloaded to " + store.getName());
//TODO: we should pass a callback here
TemplateInfo tmpl = _templateFactory.getTemplate(tmplt.getId(), DataStoreRole.Image); TemplateInfo tmpl = _templateFactory.getTemplate(tmplt.getId(), DataStoreRole.Image);
createTemplateAsync(tmpl, store, null); createTemplateAsync(tmpl, store, null);
} }