Fix Cross zone templates registration for Edge Zones

engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/TemplateService.java

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

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

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

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

@@ -18,10 +18,11 @@
 
 import java.net.URI;
 import java.net.URLDecoder;
-import java.util.Date;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.UUID;
 
 import javax.inject.Inject;
@@ -46,10 +47,9 @@
 import com.cloud.host.Status;
 import com.cloud.host.dao.HostDao;
 import com.cloud.hypervisor.Hypervisor.HypervisorType;
-import com.cloud.storage.VMTemplateVO;
-import com.cloud.storage.VMTemplateZoneVO;
 import com.cloud.storage.dao.VMTemplateDao;
 import com.cloud.storage.dao.VMTemplateZoneDao;
+import org.apache.cloudstack.engine.subsystem.api.storage.TemplateService;
 
 public class SimulatorDiscoverer extends DiscovererBase implements Discoverer, Listener, ResourceStateAdapter {
 
@@ -64,6 +64,8 @@ public class SimulatorDiscoverer extends DiscovererBase implements Discoverer, L
     @Inject
     MockAgentManager _mockAgentMgr = null;
     @Inject
+    TemplateService templateService;
+    @Inject
     MockStorageManager _mockStorageMgr = null;
 
     /**
@@ -194,23 +196,12 @@ private Map<AgentResourceBase, Map<String, String>> createAgentResources(Map<Str
     @Override
     public void postDiscovery(List<HostVO> hosts, long msId) {
 
+        Set<Long> dcIds = new HashSet<>();
         for (HostVO h : hosts) {
-            associateTemplatesToZone(h.getId(), h.getDataCenterId());
+            dcIds.add(h.getDataCenterId());
         }
-    }
-
-    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);
-                }
-            }
+        for (Long dcId : dcIds) {
+            templateService.associateCrossZoneTemplatesToZone(dcId);
         }
     }
 

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

@@ -4230,9 +4230,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,16 +4242,8 @@ 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);
-                    }
-                }
-            }
+        for (Long dcId : dcIds) {
+            _imageSrv.associateCrossZoneTemplatesToZone(dcId);
         }
     }
 

server/src/main/java/com/cloud/storage/download/DownloadListener.java

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

server/src/test/java/com/cloud/configuration/ConfigurationManagerTest.java

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

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

@@ -20,11 +20,12 @@
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.net.URI;
-import java.util.Date;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Random;
+import java.util.Set;
 
 import javax.inject.Inject;
 import javax.naming.ConfigurationException;
@@ -37,14 +38,13 @@
 import com.cloud.resource.Discoverer;
 import com.cloud.resource.DiscovererBase;
 import com.cloud.resource.ServerResource;
-import com.cloud.storage.VMTemplateVO;
-import com.cloud.storage.VMTemplateZoneVO;
 import com.cloud.storage.dao.VMTemplateDao;
 import com.cloud.storage.dao.VMTemplateZoneDao;
 import com.cloud.storage.resource.DummySecondaryStorageResource;
 import com.cloud.utils.component.ComponentContext;
 import com.cloud.utils.net.NfsUtils;
 import com.cloud.utils.script.Script;
+import org.apache.cloudstack.engine.subsystem.api.storage.TemplateService;
 
 /**
  * SecondaryStorageDiscoverer is used to discover secondary
@@ -65,6 +65,8 @@ public class SecondaryStorageDiscoverer extends DiscovererBase implements Discov
     @Inject
     protected VMTemplateDao _vmTemplateDao = null;
     @Inject
+    protected TemplateService templateService;
+    @Inject
     protected AgentManager _agentMgr = null;
 
     protected SecondaryStorageDiscoverer() {
@@ -285,24 +287,12 @@ public void postDiscovery(List<HostVO> hosts, long msId) {
                 _agentMgr.agentStatusTransitTo(h, Event.AgentDisconnected, msId);
             }
         }
+        Set<Long> dcIds = new HashSet<>();
         for (HostVO h : hosts) {
-            associateTemplatesToZone(h.getId(), h.getDataCenterId());
+            dcIds.add(h.getDataCenterId());
         }
-
-    }
-
-    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);
-                }
-            }
+        for (Long dcId : dcIds) {
+            templateService.associateCrossZoneTemplatesToZone(dcId);
         }
     }
 }