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

systemvm: add template_zone_ref record when add a new zone with same hypervisor type (#8395)

Browse Source
This commit is contained in:
Wei Zhou 2024-04-25 08:41:59 +02:00 committed by GitHub
parent 77df9ad4d7
commit 0e08a126df
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
engine/schema/src/main/java/com/cloud/upgrade/SystemVmTemplateRegistration.java
View File

@ -482,19 +482,19 @@ public class SystemVmTemplateRegistration {
templateZoneVO = vmTemplateZoneDao.persist(templateZoneVO); templateZoneVO = vmTemplateZoneDao.persist(templateZoneVO);
} else { } else {
templateZoneVO.setLastUpdated(new java.util.Date()); templateZoneVO.setLastUpdated(new java.util.Date());
if (vmTemplateZoneDao.update(templateZoneVO.getId(), templateZoneVO)) { if (!vmTemplateZoneDao.update(templateZoneVO.getId(), templateZoneVO)) {
templateZoneVO = null; templateZoneVO = null;
} }
} }
return templateZoneVO; return templateZoneVO;
} }
private void createCrossZonesTemplateZoneRefEntries(VMTemplateVO template) { private void createCrossZonesTemplateZoneRefEntries(Long templateId) {
List<DataCenterVO> dcs = dataCenterDao.listAll(); List<DataCenterVO> dcs = dataCenterDao.listAll();
for (DataCenterVO dc : dcs) { for (DataCenterVO dc : dcs) {
VMTemplateZoneVO templateZoneVO = createOrUpdateTemplateZoneEntry(dc.getId(), template.getId()); VMTemplateZoneVO templateZoneVO = createOrUpdateTemplateZoneEntry(dc.getId(), templateId);
if (templateZoneVO == null) { if (templateZoneVO == null) {
throw new CloudRuntimeException(String.format("Failed to create template_zone_ref record for the systemVM template for hypervisor: %s and zone: %s", template.getHypervisorType().name(), dc)); throw new CloudRuntimeException(String.format("Failed to create template_zone_ref record for the systemVM template (id: %s) and zone: %s", templateId, dc));
} }
} }
} }
@ -624,8 +624,9 @@ public class SystemVmTemplateRegistration {
throw new CloudRuntimeException(String.format("Failed to register template for hypervisor: %s", hypervisor.name())); throw new CloudRuntimeException(String.format("Failed to register template for hypervisor: %s", hypervisor.name()));
} }
templateId = template.getId(); templateId = template.getId();
createCrossZonesTemplateZoneRefEntries(template);
} }
createCrossZonesTemplateZoneRefEntries(templateId);
details.setId(templateId); details.setId(templateId);
String destTempFolderName = String.valueOf(templateId); String destTempFolderName = String.valueOf(templateId);
String destTempFolder = filePath + PARTIAL_TEMPLATE_FOLDER + destTempFolderName; String destTempFolder = filePath + PARTIAL_TEMPLATE_FOLDER + destTempFolderName;