Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nvazquez wants to merge 1 commit into
base: 4.20
Choose a base branch
from
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions engine/schema/src/main/java/com/cloud/user/dao/UserDataDao.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -27,4 +29,6 @@ public interface UserDataDao extends GenericDao<UserDataVO, Long> {

int removeByAccountId(long accountId);

List<UserDataVO> listByAccountId(long accountId);

}
9 changes: 9 additions & 0 deletions engine/schema/src/main/java/com/cloud/user/dao/UserDataDaoImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down Expand Up @@ -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);
}
}
26 changes: 25 additions & 1 deletion server/src/main/java/com/cloud/user/AccountManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1200,7 +1200,7 @@ public int compare(NetworkVO network1, NetworkVO network2) {
}

// Delete registered UserData
userDataDao.removeByAccountId(accountId);
Copy link
Contributor

@DaanHoogland DaanHoogland Jan 15, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe this change causes the unnecessary stubbing error from mockito?

cleanupAccountUserData(account);

// Delete Webhooks
deleteWebhooksForAccount(accountId);
Expand All @@ -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);
Copy link
Contributor

@Pearl1594 Pearl1594 Jan 15, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you think that the userDataDao.remove(..) performed on L1242 will affect the result of userDataDao.removeByAccountId(..) in other words, do we need it being done twice?

logger.info("Deleted {} registered UserData for Account {}", userDataRemoved, account);
}

@Override
public boolean disableAccount(long accountId) throws ConcurrentOperationException, ResourceUnavailableException {
boolean success = false;
Expand Down
Loading