Fix CLOUDSTACK-2525: clean up db entries in vm_template and

minchen07 · minchen07 · commit 565bdfb27b0e · 2013-05-20T16:21:45.000-07:00
template_store_ref in case of template creation failure.
diff --git a/engine/api/src/org/apache/cloudstack/storage/datastore/db/TemplateDataStoreDao.java b/engine/api/src/org/apache/cloudstack/storage/datastore/db/TemplateDataStoreDao.java
@@ -37,6 +37,8 @@ public interface TemplateDataStoreDao extends GenericDao<TemplateDataStoreVO, Lo
 
     public void deletePrimaryRecordsForStore(long id);
 
+    public void deletePrimaryRecordsForTemplate(long templateId);
+
     List<TemplateDataStoreVO> listByTemplateStore(long templateId, long storeId);
 
     List<TemplateDataStoreVO> listByTemplateStoreStatus(long templateId, long storeId, State... states);
diff --git a/engine/storage/src/org/apache/cloudstack/storage/image/db/TemplateDataStoreDaoImpl.java b/engine/storage/src/org/apache/cloudstack/storage/image/db/TemplateDataStoreDaoImpl.java
@@ -182,6 +182,15 @@ public void deletePrimaryRecordsForStore(long id) {
         txn.commit();
     }
 
+    @Override
+    public void deletePrimaryRecordsForTemplate(long templateId) {
+        SearchCriteria<TemplateDataStoreVO> sc = templateSearch.create();
+        sc.setParameters("template_id", templateId);
+        Transaction txn = Transaction.currentTxn();
+        txn.start();
+        expunge(sc);
+        txn.commit();
+    }
 
     @Override
     public List<TemplateDataStoreVO> listByTemplateStore(long templateId, long storeId) {
diff --git a/server/src/com/cloud/template/TemplateManagerImpl.java b/server/src/com/cloud/template/TemplateManagerImpl.java
@@ -1456,6 +1456,8 @@ public VirtualMachineTemplate createPrivateTemplate(CreateTemplateCmd command)
             if (privateTemplate == null) {
                 Transaction txn = Transaction.currentTxn();
                 txn.start();
+                // Remove the template_store_ref record first, otherwise, we cannot remove the template record due to FK constraints
+                this._tmplStoreDao.deletePrimaryRecordsForTemplate(templateId);
                 // Remove the template record
                 this._tmpltDao.expunge(templateId);
 
