On successful upgrade, update old systemvm templates to USER type, so that they can be deleted

Author: Pearl1594

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

@@ -16,16 +16,16 @@
 // under the License.
 package com.cloud.storage.dao;
 
-import java.util.List;
-import java.util.Map;
-
 import com.cloud.hypervisor.Hypervisor.HypervisorType;
 import com.cloud.storage.Storage;
 import com.cloud.storage.VMTemplateVO;
 import com.cloud.template.VirtualMachineTemplate;
 import com.cloud.utils.db.GenericDao;
 import com.cloud.utils.fsm.StateDao;
 
+import java.util.List;
+import java.util.Map;
+
 /*
  * Data Access Object for vm_templates table
  */
@@ -86,4 +86,6 @@ public interface VMTemplateDao extends GenericDao<VMTemplateVO, Long>, StateDao<
     List<VMTemplateVO> listByParentTemplatetId(long parentTemplatetId);
 
     VMTemplateVO findLatestTemplateByName(String name);
+
+    void updateOldSystemVmTemplateType(HypervisorType hypervisorType);
 }

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

@@ -16,19 +16,6 @@
 // under the License.
 package com.cloud.storage.dao;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-import javax.inject.Inject;
-import javax.naming.ConfigurationException;
-
-import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreDao;
-import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreVO;
-import org.apache.log4j.Logger;
-import org.springframework.stereotype.Component;
-
 import com.cloud.dc.dao.DataCenterDao;
 import com.cloud.domain.dao.DomainDao;
 import com.cloud.host.Host;
@@ -57,6 +44,19 @@
 import com.cloud.utils.db.TransactionLegacy;
 import com.cloud.utils.db.UpdateBuilder;
 import com.cloud.utils.exception.CloudRuntimeException;
+import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreDao;
+import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreVO;
+import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
+
+import javax.inject.Inject;
+import javax.naming.ConfigurationException;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 @Component
 public class VMTemplateDaoImpl extends GenericDaoBase<VMTemplateVO, Long> implements VMTemplateDao {
@@ -105,6 +105,9 @@ public class VMTemplateDaoImpl extends GenericDaoBase<VMTemplateVO, Long> implem
     private String routerTmpltName;
     private String consoleProxyTmpltName;
 
+    private static final String UPDATE_OLD_SYSTEMVM_TEMPLATE_TYPE = "UPDATE `cloud`.`vm_template` SET type = 'USER' WHERE name like '%systemvm%' AND type = 'SYSTEM' AND hypervisor_type = ? " +
+            "AND id != (SELECT * FROM (SELECT MAX(id) FROM `cloud`.`vm_template` WHERE name like '%systemvm%' AND type = 'SYSTEM' AND hypervisor_type = ? ) as t)";
+
     public VMTemplateDaoImpl() {
         super();
         LatestTemplateByHypervisorTypeSearch = createSearchBuilder();
@@ -717,4 +720,22 @@ public boolean updateState(
         }
         return rows > 0;
     }
+
+    @Override
+    public void updateOldSystemVmTemplateType(HypervisorType hypervisorType) {
+        TransactionLegacy txn = TransactionLegacy.currentTxn();
+
+        StringBuilder sql = new StringBuilder(UPDATE_OLD_SYSTEMVM_TEMPLATE_TYPE);
+        try {
+            PreparedStatement updateStatement = txn.prepareAutoCloseStatement(sql.toString());
+            updateStatement.setString(1, hypervisorType.name());
+            updateStatement.setString(2, hypervisorType.name());
+            updateStatement.executeUpdate();
+        } catch (SQLException e) {
+            throw new CloudRuntimeException("DB Exception on: " + sql, e);
+        } catch (Throwable e) {
+            throw new CloudRuntimeException("Caught: " + sql, e);
+        }
+
+    }
 }

engine/schema/src/main/java/com/cloud/upgrade/SystemVmTemplateRegistration.java

@@ -879,7 +879,18 @@ public void doInTransactionWithoutResult(final TransactionStatus status) {
                     }
                 }
                 LOGGER.debug("Updating System Vm Template IDs Complete");
+                updateOldSystemVMTemplates();
             }
         });
     }
+
+    public void updateOldSystemVMTemplates() {
+        for (Hypervisor.HypervisorType hypervisorType : hypervisorList) {
+            try {
+                vmTemplateDao.updateOldSystemVmTemplateType(hypervisorType);
+            } catch (Exception e) {
+                LOGGER.error(String.format("Failed to update systemvm template type due to: %s", e.getLocalizedMessage()));
+            }
+        }
+    }
 }