Skip to content

Fix Cross zone templates registration for Edge Zones #12874

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vishesh92 wants to merge 4 commits into
base: 4.22
Choose a base branch
from
Open

Fix Cross zone templates registration for Edge Zones #12874

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b5c1a21
Fix Cross zone templates registration for Edge Zones
vishesh92 Mar 23, 2026
b2950d7
Fix failing unit test
vishesh92 Mar 23, 2026
ca0a3fe
Address comments
vishesh92 Mar 23, 2026
f0b7336
Address comments
vishesh92 Mar 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/TemplateService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ public TemplateInfo getTemplate() {

void associateTemplateToZone(long templateId, Long zoneId);

void associateCrosszoneTemplatesToZone(long dcId);
void associateCrossZoneTemplatesToZone(long dcId);

AsyncCallFuture<TemplateApiResult> createDatadiskTemplateAsync(TemplateInfo parentTemplate, TemplateInfo dataDiskTemplate, String path, String diskId, long fileSize, boolean bootable);

Expand Down
2 changes: 2 additions & 0 deletions engine/schema/src/main/java/com/cloud/storage/dao/VMTemplateDao.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ public interface VMTemplateDao extends GenericDao<VMTemplateVO, Long>, StateDao<

public List<VMTemplateVO> listAllActive();

List<VMTemplateVO> listAllCrossZoneTemplates();

public List<VMTemplateVO> listByState(VirtualMachineTemplate.State... states);

public List<VMTemplateVO> listByHypervisorType(List<HypervisorType> hyperTypes);
Expand Down
8 changes: 8 additions & 0 deletions engine/schema/src/main/java/com/cloud/storage/dao/VMTemplateDaoImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,6 +418,7 @@ public boolean configure(String name, Map<String, Object> params) throws Configu
AllFieldsSearch.and("notDestroyed", AllFieldsSearch.entity().getState(), SearchCriteria.Op.NEQ);
AllFieldsSearch.and("updatedCount", AllFieldsSearch.entity().getUpdatedCount(), SearchCriteria.Op.EQ);
AllFieldsSearch.and("name", AllFieldsSearch.entity().getName(), SearchCriteria.Op.EQ);
AllFieldsSearch.and("crossZone", AllFieldsSearch.entity().isCrossZones(), SearchCriteria.Op.EQ);
AllFieldsSearch.done();

ParentTemplateIdSearch = createSearchBuilder();
Expand Down Expand Up @@ -571,6 +572,13 @@ public List<VMTemplateVO> listAllActive() {
return listBy(sc);
}

@Override
public List<VMTemplateVO> listAllCrossZoneTemplates() {
SearchCriteria<VMTemplateVO> sc = AllFieldsSearch.create();
sc.setParameters("crossZone", true);
return listBy(sc);
}

@Override
public List<VMTemplateVO> listByState(VirtualMachineTemplate.State... states) {
SearchCriteria<VMTemplateVO> sc = ActiveTmpltSearch.create();
Expand Down
16 changes: 7 additions & 9 deletions .../storage/image/src/main/java/org/apache/cloudstack/storage/image/TemplateServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -881,17 +881,15 @@ public void associateTemplateToZone(long templateId, Long zoneId) {

// update template_zone_ref for cross-zone template for newly added zone
@Override
public void associateCrosszoneTemplatesToZone(long dcId) {
public void associateCrossZoneTemplatesToZone(long dcId) {
VMTemplateZoneVO tmpltZone;

List<VMTemplateVO> allTemplates = _templateDao.listAll();
for (VMTemplateVO vt : allTemplates) {
if (vt.isCrossZones()) {
tmpltZone = _vmTemplateZoneDao.findByZoneTemplate(dcId, vt.getId());
if (tmpltZone == null) {
VMTemplateZoneVO vmTemplateZone = new VMTemplateZoneVO(dcId, vt.getId(), new Date());
_vmTemplateZoneDao.persist(vmTemplateZone);
}
List<VMTemplateVO> crossZoneTemplates = _templateDao.listAllCrossZoneTemplates();
for (VMTemplateVO vt : crossZoneTemplates) {
tmpltZone = _vmTemplateZoneDao.findByZoneTemplate(dcId, vt.getId());
if (tmpltZone == null) {
VMTemplateZoneVO vmTemplateZone = new VMTemplateZoneVO(dcId, vt.getId(), new Date());
_vmTemplateZoneDao.persist(vmTemplateZone);
Comment thread
vishesh92 marked this conversation as resolved.
}
}
}
Expand Down
14 changes: 6 additions & 8 deletions plugins/hypervisors/simulator/src/main/java/com/cloud/resource/SimulatorDiscoverer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,14 +202,12 @@ public void postDiscovery(List<HostVO> hosts, long msId) {
private void associateTemplatesToZone(long hostId, long dcId) {
VMTemplateZoneVO tmpltZone;

List<VMTemplateVO> allTemplates = _vmTemplateDao.listAll();
for (VMTemplateVO vt : allTemplates) {
if (vt.isCrossZones()) {
tmpltZone = _vmTemplateZoneDao.findByZoneTemplate(dcId, vt.getId());
if (tmpltZone == null) {
VMTemplateZoneVO vmTemplateZone = new VMTemplateZoneVO(dcId, vt.getId(), new Date());
_vmTemplateZoneDao.persist(vmTemplateZone);
}
List<VMTemplateVO> crossZoneTemplates = _vmTemplateDao.listAllCrossZoneTemplates();
for (VMTemplateVO vt : crossZoneTemplates) {
tmpltZone = _vmTemplateZoneDao.findByZoneTemplate(dcId, vt.getId());
if (tmpltZone == null) {
VMTemplateZoneVO vmTemplateZone = new VMTemplateZoneVO(dcId, vt.getId(), new Date());
_vmTemplateZoneDao.persist(vmTemplateZone);
}
}
}
Expand Down
9 changes: 9 additions & 0 deletions server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@
import org.apache.cloudstack.context.CallContext;
import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
import org.apache.cloudstack.engine.orchestration.service.VolumeOrchestrationService;
import org.apache.cloudstack.engine.subsystem.api.storage.TemplateService;
import org.apache.cloudstack.engine.subsystem.api.storage.ZoneScope;
import org.apache.cloudstack.framework.config.ConfigDepot;
import org.apache.cloudstack.framework.config.ConfigKey;
Expand Down Expand Up @@ -454,6 +455,8 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
@Inject
StorageManager _storageManager;
@Inject
TemplateService _templateService;
@Inject
ImageStoreDao _imageStoreDao;
@Inject
ImageStoreDetailsDao _imageStoreDetailsDao;
Expand Down Expand Up @@ -3157,6 +3160,12 @@ public DataCenterVO doInTransaction(final TransactionStatus status) {
// Create default system networks
createDefaultSystemNetworks(zone.getId());

// Associate cross zone templates with the Edge Zones here because they don't have SSVMs
// For Core zones, this happens when the SSVM starts up.
if (isEdge) {
_templateService.associateCrossZoneTemplatesToZone(zone.getId());
}

return zone;
}
});
Expand Down
16 changes: 7 additions & 9 deletions server/src/main/java/com/cloud/storage/StorageManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4232,7 +4232,6 @@ private void duplicateCacheStoreRecordsToRegionStore(long storeId) {
private void associateCrosszoneTemplatesToZone(Long zoneId) {
VMTemplateZoneVO tmpltZone;
Comment thread
vishesh92 marked this conversation as resolved.
Outdated
Comment thread
vishesh92 marked this conversation as resolved.
Outdated

List<VMTemplateVO> allTemplates = _vmTemplateDao.listAll();
List<Long> dcIds = new ArrayList<>();
if (zoneId != null) {
dcIds.add(zoneId);
Expand All @@ -4245,14 +4244,13 @@ private void associateCrosszoneTemplatesToZone(Long zoneId) {
}
}

for (VMTemplateVO vt : allTemplates) {
if (vt.isCrossZones()) {
for (Long dcId : dcIds) {
tmpltZone = _vmTemplateZoneDao.findByZoneTemplate(dcId, vt.getId());
if (tmpltZone == null) {
VMTemplateZoneVO vmTemplateZone = new VMTemplateZoneVO(dcId, vt.getId(), new Date());
_vmTemplateZoneDao.persist(vmTemplateZone);
}
List<VMTemplateVO> crossZoneTemplates = _vmTemplateDao.listAllCrossZoneTemplates();
for (VMTemplateVO vt : crossZoneTemplates) {
for (Long dcId : dcIds) {
tmpltZone = _vmTemplateZoneDao.findByZoneTemplate(dcId, vt.getId());
if (tmpltZone == null) {
VMTemplateZoneVO vmTemplateZone = new VMTemplateZoneVO(dcId, vt.getId(), new Date());
_vmTemplateZoneDao.persist(vmTemplateZone);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion server/src/main/java/com/cloud/storage/download/DownloadListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ public void processConnect(Host agent, StartupCommand cmd, boolean forRebalance)
}
_imageSrv.handleSysTemplateDownload(hostHyper, agent.getDataCenterId());
// update template_zone_ref for cross-zone templates
_imageSrv.associateCrosszoneTemplatesToZone(agent.getDataCenterId());
_imageSrv.associateCrossZoneTemplatesToZone(agent.getDataCenterId());

}
/* This can be removed
Expand Down
3 changes: 3 additions & 0 deletions server/src/test/java/com/cloud/configuration/ConfigurationManagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@
import org.apache.cloudstack.api.command.user.network.ListNetworkOfferingsCmd;
import org.apache.cloudstack.context.CallContext;
import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
import org.apache.cloudstack.engine.subsystem.api.storage.TemplateService;
import org.apache.cloudstack.engine.subsystem.api.storage.ZoneScope;
import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
import org.apache.cloudstack.framework.messagebus.MessageBusBase;
Expand Down Expand Up @@ -223,6 +224,8 @@ public class ConfigurationManagerTest {
Ipv6GuestPrefixSubnetNetworkMapDao ipv6GuestPrefixSubnetNetworkMapDao;
@Mock
MessageBusBase messageBus;
@Mock
TemplateService _templateService;

VlanVO vlan = new VlanVO(Vlan.VlanType.VirtualNetwork, "vlantag", "vlangateway", "vlannetmask", 1L, "iprange", 1L, 1L, null, null, null);

Expand Down
14 changes: 6 additions & 8 deletions ...rver/src/main/java/org/apache/cloudstack/storage/resource/SecondaryStorageDiscoverer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,14 +294,12 @@ public void postDiscovery(List<HostVO> hosts, long msId) {
private void associateTemplatesToZone(long hostId, long dcId) {
VMTemplateZoneVO tmpltZone;

List<VMTemplateVO> allTemplates = _vmTemplateDao.listAll();
for (VMTemplateVO vt : allTemplates) {
if (vt.isCrossZones()) {
tmpltZone = _vmTemplateZoneDao.findByZoneTemplate(dcId, vt.getId());
if (tmpltZone == null) {
VMTemplateZoneVO vmTemplateZone = new VMTemplateZoneVO(dcId, vt.getId(), new Date());
_vmTemplateZoneDao.persist(vmTemplateZone);
}
List<VMTemplateVO> crossZoneTemplates = _vmTemplateDao.listAllCrossZoneTemplates();
for (VMTemplateVO vt : crossZoneTemplates) {
tmpltZone = _vmTemplateZoneDao.findByZoneTemplate(dcId, vt.getId());
if (tmpltZone == null) {
VMTemplateZoneVO vmTemplateZone = new VMTemplateZoneVO(dcId, vt.getId(), new Date());
_vmTemplateZoneDao.persist(vmTemplateZone);
}
}
}
Comment thread
vishesh92 marked this conversation as resolved.
Outdated
Expand Down
Loading