Enforce secondary storage copy limits and replicate templates up to capacity during template management

Author: Damans227

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

@@ -1146,6 +1146,15 @@ protected Void createTemplateCallback(AsyncCallbackDispatcher<TemplateServiceImp
             return null;
         }
 
+        try {
+            DataStore destStore = template.getDataStore();
+            if (destStore != null && destStore.getScope() != null && destStore.getScope().getScopeId() != null) {
+                enforceSecStorageCopyLimit(template.getId(), destStore.getScope().getScopeId());
+            }
+        } catch (Exception e) {
+            logger.warn("Failed to enforce secstorage copy limit after template [{}] became Ready: {}", template.getUuid(), e.getMessage());
+        }
+
         if (parentCallback != null) {
             parentCallback.complete(result);
         }
@@ -1587,6 +1596,14 @@ protected Void copyTemplateCallBack(AsyncCallbackDispatcher<TemplateServiceImpl,
                 destTemplate.processEvent(Event.OperationFailed);
             } else {
                 destTemplate.processEvent(Event.OperationSucceeded, result.getAnswer());
+                try {
+                    DataStore destStore = destTemplate.getDataStore();
+                    if (destStore != null && destStore.getScope() != null && destStore.getScope().getScopeId() != null) {
+                        enforceSecStorageCopyLimit(destTemplate.getId(), destStore.getScope().getScopeId());
+                    }
+                } catch (Exception e) {
+                    logger.warn("Failed to enforce secstorage copy limit after copy of template [{}] became Ready: {}", destTemplate.getUuid(), e.getMessage());
+                }
             }
             future.complete(res);
         } catch (Exception e) {

server/src/main/java/com/cloud/template/TemplateManagerImpl.java

@@ -1703,6 +1703,7 @@ public void doInTransactionWithoutResult(TransactionStatus status) {
         if (isPublic != null || isFeatured != null || "reset".equalsIgnoreCase(operation)) {
             for (VMTemplateZoneVO templateZone : _tmpltZoneDao.listByTemplateId(template.getId())) {
                 _tmpltSvr.enforceSecStorageCopyLimit(template.getId(), templateZone.getZoneId());
+                _tmpltSvr.replicateTemplateUpToCap(template.getId(), templateZone.getZoneId());
             }
         }
         return true;