Fix for Deleted userdata owned by a deleted account remains linked with the template

Author: nvazquez

engine/schema/src/main/java/com/cloud/user/dao/UserDataDao.java

@@ -19,6 +19,8 @@
 import com.cloud.user.UserDataVO;
 import com.cloud.utils.db.GenericDao;
 
+import java.util.List;
+
 public interface UserDataDao extends GenericDao<UserDataVO, Long> {
 
     public UserDataVO findByUserData(long accountId, long domainId, String userData);
@@ -27,4 +29,6 @@ public interface UserDataDao extends GenericDao<UserDataVO, Long> {
 
     int removeByAccountId(long accountId);
 
+    List<UserDataVO> listByAccountId(long accountId);
+
 }

engine/schema/src/main/java/com/cloud/user/dao/UserDataDaoImpl.java

@@ -22,6 +22,8 @@
 import com.cloud.utils.db.SearchCriteria;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 @Component
 public class UserDataDaoImpl extends GenericDaoBase<UserDataVO, Long> implements UserDataDao  {
 
@@ -70,4 +72,11 @@ public int removeByAccountId(long accountId) {
         sc.setParameters("accountId", accountId);
         return remove(sc);
     }
+
+    @Override
+    public List<UserDataVO> listByAccountId(long accountId) {
+        SearchCriteria<UserDataVO> sc = userdataSearch.create();
+        sc.setParameters("accountId", accountId);
+        return listBy(sc);
+    }
 }

server/src/main/java/com/cloud/user/AccountManagerImpl.java

@@ -1200,7 +1200,7 @@ public int compare(NetworkVO network1, NetworkVO network2) {
             }
 
             // Delete registered UserData
-            userDataDao.removeByAccountId(accountId);
+            cleanupAccountUserData(account);
 
             // Delete Webhooks
             deleteWebhooksForAccount(accountId);
@@ -1221,6 +1221,30 @@ public int compare(NetworkVO network1, NetworkVO network2) {
         }
     }
 
+    private void cleanupAccountUserData(AccountVO account) {
+        long accountId = account.getId();
+        List<UserDataVO> userData = userDataDao.listByAccountId(accountId);
+        if (CollectionUtils.isEmpty(userData)) {
+            return;
+        }
+        logger.info("Deleting {} registered UserData for Account {}", userData.size(), account);
+        for (UserDataVO userdata : userData) {
+            List<VMTemplateVO> templatesLinkedToUserdata = _templateDao.findTemplatesLinkedToUserdata(userdata.getId());
+            if (CollectionUtils.isEmpty(templatesLinkedToUserdata)) {
+                continue;
+            }
+            for (VMTemplateVO template : templatesLinkedToUserdata) {
+                logger.debug("Unregistering UserData {} from Template {}", userdata, template);
+                template.setUserDataId(null);
+                template.setUserDataLinkPolicy(null);
+                _templateDao.update(template.getId(), template);
+            }
+            userDataDao.remove(userdata.getId());
+        }
+        int userDataRemoved = userDataDao.removeByAccountId(accountId);
+        logger.info("Deleted {} registered UserData for Account {}", userDataRemoved, account);
+    }
+
     @Override
     public boolean disableAccount(long accountId) throws ConcurrentOperationException, ResourceUnavailableException {
         boolean success = false;