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

CLOUDSTACK-7665 File.separator shouldn't be used in this case, the

Browse Source 
separator is fixed just like the rest of the path
This commit is contained in:
Hugo Trippaers 2014-10-02 09:54:53 +02:00
parent 70efe1507c
commit 47ac3e4fd1
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,7 +18,6 @@
*/ */
package org.apache.cloudstack.storage.image; package org.apache.cloudstack.storage.image;
import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.HashSet; import java.util.HashSet;
@ -334,7 +333,7 @@ public class TemplateServiceImpl implements TemplateService {
s_logger.info("msg"); s_logger.info("msg");
if (tmplt.getUrl() == null) { if (tmplt.getUrl() == null) {
msg = msg =
"Private Template (" + tmplt + ") with install path " + tmpltInfo.getInstallPath() + "Private Template (" + tmplt + ") with install path " + tmpltInfo.getInstallPath() +
"is corrupted, please check in image store: " + tmpltStore.getDataStoreId(); "is corrupted, please check in image store: " + tmpltStore.getDataStoreId();
s_logger.warn(msg); s_logger.warn(msg);
} else { } else {
@ -362,22 +361,22 @@ public class TemplateServiceImpl implements TemplateService {
long accountId = tmplt.getAccountId(); long accountId = tmplt.getAccountId();
try { try {
_resourceLimitMgr.checkResourceLimit(_accountMgr.getAccount(accountId), _resourceLimitMgr.checkResourceLimit(_accountMgr.getAccount(accountId),
com.cloud.configuration.Resource.ResourceType.secondary_storage, com.cloud.configuration.Resource.ResourceType.secondary_storage,
tmpltInfo.getSize() - UriUtils.getRemoteSize(tmplt.getUrl())); tmpltInfo.getSize() - UriUtils.getRemoteSize(tmplt.getUrl()));
} catch (ResourceAllocationException e) { } catch (ResourceAllocationException e) {
s_logger.warn(e.getMessage()); s_logger.warn(e.getMessage());
_alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_RESOURCE_LIMIT_EXCEEDED, zoneId, null, e.getMessage(), e.getMessage()); _alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_RESOURCE_LIMIT_EXCEEDED, zoneId, null, e.getMessage(), e.getMessage());
} finally { } finally {
_resourceLimitMgr.recalculateResourceCount(accountId, _accountMgr.getAccount(accountId).getDomainId(), _resourceLimitMgr.recalculateResourceCount(accountId, _accountMgr.getAccount(accountId).getDomainId(),
com.cloud.configuration.Resource.ResourceType.secondary_storage.getOrdinal()); com.cloud.configuration.Resource.ResourceType.secondary_storage.getOrdinal());
} }
} }
} }
_vmTemplateStoreDao.update(tmpltStore.getId(), tmpltStore); _vmTemplateStoreDao.update(tmpltStore.getId(), tmpltStore);
} else { } else {
tmpltStore = tmpltStore =
new TemplateDataStoreVO(storeId, tmplt.getId(), new Date(), 100, Status.DOWNLOADED, null, null, null, tmpltInfo.getInstallPath(), new TemplateDataStoreVO(storeId, tmplt.getId(), new Date(), 100, Status.DOWNLOADED, null, null, null, tmpltInfo.getInstallPath(),
tmplt.getUrl()); tmplt.getUrl());
tmpltStore.setSize(tmpltInfo.getSize()); tmpltStore.setSize(tmpltInfo.getSize());
tmpltStore.setPhysicalSize(tmpltInfo.getPhysicalSize()); tmpltStore.setPhysicalSize(tmpltInfo.getPhysicalSize());
tmpltStore.setDataStoreRole(store.getRole()); tmpltStore.setDataStoreRole(store.getRole());
@ -392,7 +391,7 @@ public class TemplateServiceImpl implements TemplateService {
} }
} else { } else {
s_logger.info("Template Sync did not find " + uniqueName + " on image store " + storeId + s_logger.info("Template Sync did not find " + uniqueName + " on image store " + storeId +
", may request download based on available hypervisor types"); ", may request download based on available hypervisor types");
if (tmpltStore != null) { if (tmpltStore != null) {
if (_storeMgr.isRegionStore(store) && tmpltStore.getDownloadState() == VMTemplateStorageResourceAssoc.Status.DOWNLOADED if (_storeMgr.isRegionStore(store) && tmpltStore.getDownloadState() == VMTemplateStorageResourceAssoc.Status.DOWNLOADED
&& tmpltStore.getState() == State.Ready && tmpltStore.getState() == State.Ready
@ -451,7 +450,7 @@ public class TemplateServiceImpl implements TemplateService {
createTemplateAsync(tmpl, store, null); createTemplateAsync(tmpl, store, null);
} else { } else {
s_logger.info("Skip downloading template " + tmplt.getUniqueName() + " since current data center does not have hypervisor " + s_logger.info("Skip downloading template " + tmplt.getUniqueName() + " since current data center does not have hypervisor " +
tmplt.getHypervisorType().toString()); tmplt.getHypervisorType().toString());
} }
} }
} }
@ -652,8 +651,8 @@ public class TemplateServiceImpl implements TemplateService {
// But we need to set default install path so that sync can be done in the right s3 path // But we need to set default install path so that sync can be done in the right s3 path
TemplateInfo templateOnStore = _templateFactory.getTemplate(template, store); TemplateInfo templateOnStore = _templateFactory.getTemplate(template, store);
String installPath = String installPath =
TemplateConstants.DEFAULT_TMPLT_ROOT_DIR + "/" + TemplateConstants.DEFAULT_TMPLT_FIRST_LEVEL_DIR + template.getAccountId() + "/" + template.getId() + "/" + TemplateConstants.DEFAULT_TMPLT_ROOT_DIR + "/" + TemplateConstants.DEFAULT_TMPLT_FIRST_LEVEL_DIR + template.getAccountId() + "/" + template.getId() + "/" +
template.getUniqueName(); template.getUniqueName();
((TemplateObject)templateOnStore).setInstallPath(installPath); ((TemplateObject)templateOnStore).setInstallPath(installPath);
TemplateOpContext<TemplateApiResult> context = new TemplateOpContext<TemplateApiResult>(null, (TemplateObject)templateOnStore, future); TemplateOpContext<TemplateApiResult> context = new TemplateOpContext<TemplateApiResult>(null, (TemplateObject)templateOnStore, future);
AsyncCallbackDispatcher<TemplateServiceImpl, CopyCommandResult> caller = AsyncCallbackDispatcher.create(this); AsyncCallbackDispatcher<TemplateServiceImpl, CopyCommandResult> caller = AsyncCallbackDispatcher.create(this);
@ -710,7 +709,7 @@ public class TemplateServiceImpl implements TemplateService {
TemplateApiResult result = future.get(); TemplateApiResult result = future.get();
if (result.isFailed()) { if (result.isFailed()) {
throw new CloudRuntimeException("sync template from cache to region wide store failed for image store " + store.getName() + ":" + throw new CloudRuntimeException("sync template from cache to region wide store failed for image store " + store.getName() + ":" +
result.getResult()); result.getResult());
} }
_cacheMgr.releaseCacheObject(srcTemplate); // reduce reference count for template on cache, so it can recycled by schedule _cacheMgr.releaseCacheObject(srcTemplate); // reduce reference count for template on cache, so it can recycled by schedule
} catch (Exception ex) { } catch (Exception ex) {
@ -733,7 +732,7 @@ public class TemplateServiceImpl implements TemplateService {
String url = generateCopyUrl(srcTemplate); String url = generateCopyUrl(srcTemplate);
if (url == null) { if (url == null) {
s_logger.warn("Unable to start/resume copy of template " + srcTemplate.getUniqueName() + " to " + destStore.getName() + s_logger.warn("Unable to start/resume copy of template " + srcTemplate.getUniqueName() + " to " + destStore.getName() +
", no secondary storage vm in running state in source zone"); ", no secondary storage vm in running state in source zone");
throw new CloudRuntimeException("No secondary VM in running state in source template zone "); throw new CloudRuntimeException("No secondary VM in running state in source template zone ");
} }
@ -877,8 +876,8 @@ public class TemplateServiceImpl implements TemplateService {
TemplateDataStoreVO tmpltStore = _vmTemplateStoreDao.findByStoreTemplate(storeId, tmplt.getId()); TemplateDataStoreVO tmpltStore = _vmTemplateStoreDao.findByStoreTemplate(storeId, tmplt.getId());
if (tmpltStore == null) { if (tmpltStore == null) {
tmpltStore = tmpltStore =
new TemplateDataStoreVO(storeId, tmplt.getId(), new Date(), 100, Status.DOWNLOADED, null, null, null, new TemplateDataStoreVO(storeId, tmplt.getId(), new Date(), 100, Status.DOWNLOADED, null, null, null,
TemplateConstants.DEFAULT_SYSTEM_VM_TEMPLATE_PATH + tmplt.getId() + File.separator, tmplt.getUrl()); TemplateConstants.DEFAULT_SYSTEM_VM_TEMPLATE_PATH + tmplt.getId() + '/', tmplt.getUrl());
tmpltStore.setSize(0L); tmpltStore.setSize(0L);
tmpltStore.setPhysicalSize(0); // no size information for tmpltStore.setPhysicalSize(0); // no size information for
// pre-seeded system vm templates // pre-seeded system vm templates