Fix Cross zone templates registration for Edge Zones

Author: vishesh92

engine/schema/src/main/java/com/cloud/storage/dao/VMTemplateDao.java

@@ -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);

engine/schema/src/main/java/com/cloud/storage/dao/VMTemplateDaoImpl.java

@@ -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();
@@ -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();

engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/TemplateServiceImpl.java

@@ -884,14 +884,12 @@ public void associateTemplateToZone(long templateId, Long zoneId) {
     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);
             }
         }
     }

plugins/hypervisors/simulator/src/main/java/com/cloud/resource/SimulatorDiscoverer.java

@@ -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);
             }
         }
     }

server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java

@@ -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;
@@ -454,6 +455,8 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
     @Inject
     StorageManager _storageManager;
     @Inject
+    TemplateService _templateService;
+    @Inject
     ImageStoreDao _imageStoreDao;
     @Inject
     ImageStoreDetailsDao _imageStoreDetailsDao;
@@ -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;
             }
         });

server/src/main/java/com/cloud/storage/StorageManagerImpl.java

@@ -4232,7 +4232,6 @@ private void duplicateCacheStoreRecordsToRegionStore(long storeId) {
     private void associateCrosszoneTemplatesToZone(Long zoneId) {
         VMTemplateZoneVO tmpltZone;
 
-        List<VMTemplateVO> allTemplates = _vmTemplateDao.listAll();
         List<Long> dcIds = new ArrayList<>();
         if (zoneId != null) {
             dcIds.add(zoneId);
@@ -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);
                 }
             }
         }

services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/SecondaryStorageDiscoverer.java

@@ -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);
             }
         }
     }