You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by GitBox <gi...@apache.org> on 2018/01/08 08:52:05 UTC
[GitHub] rhtyd commented on a change in pull request #2146: CLOUDSTACK-4757: Support OVA files with multiple disks for templates
rhtyd commented on a change in pull request #2146: CLOUDSTACK-4757: Support OVA files with multiple disks for templates
URL: https://github.com/apache/cloudstack/pull/2146#discussion_r160093366
##########
File path: engine/storage/image/src/org/apache/cloudstack/storage/image/TemplateServiceImpl.java
##########
@@ -691,6 +723,151 @@ protected Void createTemplateCallback(AsyncCallbackDispatcher<TemplateServiceImp
return null;
}
+
+ protected boolean createDataDiskTemplates(TemplateInfo parentTemplate) {
+ // Get Datadisk template (if any) for OVA
+ List<DatadiskTO> dataDiskTemplates = new ArrayList<DatadiskTO>();
+ ImageStoreEntity tmpltStore = (ImageStoreEntity)parentTemplate.getDataStore();
+ dataDiskTemplates = tmpltStore.getDataDiskTemplates(parentTemplate);
+ s_logger.error("MDOVA createDataDiskTemplates Found " + dataDiskTemplates.size() + " Datadisk template(s) for template: " + parentTemplate.getId());
+ int diskCount = 0;
+ VMTemplateVO templateVO = _templateDao.findById(parentTemplate.getId());
+ DataStore imageStore = parentTemplate.getDataStore();
+ Map<String, String> details = new HashMap<String, String>();
+ for (DatadiskTO diskTemplate : dataDiskTemplates) {
+ if (!diskTemplate.isBootable()) {
+ createChildDataDiskTemplate(diskTemplate, templateVO, parentTemplate, imageStore, diskCount++);
+ if (!diskTemplate.isIso() && details.get(VmDetailConstants.DATA_DISK_CONTROLLER) == null){
+ details.put(VmDetailConstants.DATA_DISK_CONTROLLER, getDiskControllerDetails(diskTemplate));
+ details.put(VmDetailConstants.DATA_DISK_CONTROLLER + diskTemplate.getDiskId(), getDiskControllerDetails(diskTemplate));
+ }
+ } else {
+ finalizeParentTemplate(diskTemplate, templateVO, parentTemplate, imageStore, diskCount++);
+ details.put(VmDetailConstants.ROOT_DISK_CONTROLLER, getDiskControllerDetails(diskTemplate));
+ }
+ }
+ templateVO.setDetails(details);
+ _templateDao.saveDetails(templateVO);
+ return true;
+ }
+
+ private boolean createChildDataDiskTemplate(DatadiskTO dataDiskTemplate, VMTemplateVO template, TemplateInfo parentTemplate, DataStore imageStore, int diskCount) {
+ // Make an entry in vm_template table
+ Storage.ImageFormat format = dataDiskTemplate.isIso() ? Storage.ImageFormat.ISO : template.getFormat();
+ String suffix = dataDiskTemplate.isIso() ? "-IsoDiskTemplate-" : "-DataDiskTemplate-";
+ TemplateType ttype = dataDiskTemplate.isIso() ? TemplateType.ISODISK : TemplateType.DATADISK;
+ final long templateId = _templateDao.getNextInSequence(Long.class, "id");
+ long guestOsId = dataDiskTemplate.isIso() ? 1 : 0;
+ String templateName = dataDiskTemplate.isIso() ? dataDiskTemplate.getPath().substring(dataDiskTemplate.getPath().lastIndexOf(File.separator) + 1) : template.getName() + suffix + diskCount;
+ VMTemplateVO templateVO = new VMTemplateVO(templateId, templateName, format, false, false, false, ttype, template.getUrl(),
+ template.requiresHvm(), template.getBits(), template.getAccountId(), null, templateName, false, guestOsId, false, template.getHypervisorType(), null,
+ null, false, false);
+ if (dataDiskTemplate.isIso()){
+ templateVO.setUniqueName(templateName);
+ }
+ templateVO.setParentTemplateId(template.getId());
+ templateVO.setSize(dataDiskTemplate.getVirtualSize());
+ templateVO = _templateDao.persist(templateVO);
+ // Make sync call to create Datadisk templates in image store
+ TemplateApiResult result = null;
+ TemplateInfo dataDiskTemplateInfo = imageFactory.getTemplate(templateVO.getId(), imageStore);
+ AsyncCallFuture<TemplateApiResult> future = createDatadiskTemplateAsync(parentTemplate, dataDiskTemplateInfo, dataDiskTemplate.getPath(), dataDiskTemplate.getDiskId(),
+ dataDiskTemplate.getFileSize(), dataDiskTemplate.isBootable());
+ try {
+ result = future.get();
+ if (result.isSuccess()) {
+ // Make an entry in template_zone_ref table
+ if (imageStore.getScope().getScopeType() == ScopeType.REGION) {
+ associateTemplateToZone(templateId, null);
+ } else if (imageStore.getScope().getScopeType() == ScopeType.ZONE) {
+ Long zoneId = ((ImageStoreEntity)imageStore).getDataCenterId();
+ VMTemplateZoneVO templateZone = new VMTemplateZoneVO(zoneId, templateId, new Date());
+ _vmTemplateZoneDao.persist(templateZone);
+ }
+ _resourceLimitMgr.incrementResourceCount(template.getAccountId(), ResourceType.secondary_storage, templateVO.getSize());
+ } else {
+ s_logger.error("MDOVA createDataDiskTemplates Creation of Datadisk: " + templateVO.getId() + " failed: " + result.getResult());
+ // Delete the Datadisk templates that were already created as they are now invalid
+ s_logger.debug("Since creation of Datadisk template: " + templateVO.getId() + " failed, delete other Datadisk templates that were created as part of parent"
+ + " template download");
+ TemplateInfo parentTemplateInfo = imageFactory.getTemplate(templateVO.getParentTemplateId(), imageStore);
+ cleanupDatadiskTemplates(parentTemplateInfo);
+ }
+ return result.isSuccess();
+ } catch (Exception e) {
+ s_logger.error("Creation of Datadisk: " + templateVO.getId() + " failed: " + result.getResult(), e);
+ return false;
+ }
+ }
+
+ private boolean finalizeParentTemplate(DatadiskTO dataDiskTemplate, VMTemplateVO templateVO, TemplateInfo parentTemplate, DataStore imageStore, int diskCount) {
+ TemplateInfo templateInfo = imageFactory.getTemplate(templateVO.getId(), imageStore);
+ AsyncCallFuture<TemplateApiResult> templateFuture = createDatadiskTemplateAsync(parentTemplate, templateInfo, dataDiskTemplate.getPath(), dataDiskTemplate.getDiskId(),
+ dataDiskTemplate.getFileSize(), dataDiskTemplate.isBootable());
+ TemplateApiResult result = null;
+ try {
+ result = templateFuture.get();
+ if (!result.isSuccess()) {
+ s_logger.debug("Since creation of parent template: " + templateInfo.getId() + " failed, delete Datadisk templates that were created as part of parent"
+ + " template download");
+ cleanupDatadiskTemplates(templateInfo);
+ }
+ return result.isSuccess();
+ } catch (Exception e) {
+ s_logger.error("Creation of template: " + templateVO.getId() + " failed: " + result.getResult(), e);
+ return false;
+ }
+ }
+
+ private String getDiskControllerDetails(DatadiskTO diskTemplate) {
+ String controller = diskTemplate.getDiskController() ;
+ String controlerSubType = diskTemplate.getDiskControllerSubType();
+ if (controller != null) {
Review comment:
I've simplified this as if-else.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services