Skip to content

Fix/13612 template cleanup on domain delete #13614

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
Chinmay048 wants to merge 2 commits into
base: main
Choose a base branch
from
+7 −2
Open

Fix/13612 template cleanup on domain delete #13614

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4284ac3
fix(server): prevent boolean overwrite in template cleanup during acc…
Chinmay048 Jul 14, 2026
e7c4135
fix(server): prevent boolean overwrite in template cleanup during acc…
Chinmay048 Jul 14, 2026
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
9 changes: 7 additions & 2 deletions 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 @@ -1016,15 +1016,20 @@ protected boolean cleanupAccount(AccountVO account, long callerUserId, Account c
logger.debug("Successfully deleted snapshots directories for all volumes under account {} across all zones", account);
}


// clean up templates
List<VMTemplateVO> userTemplates = _templateDao.listByAccountId(accountId);
boolean allTemplatesDeleted = true;
for (VMTemplateVO template : userTemplates) {
if (template.getRemoved() == null) {
try {
allTemplatesDeleted = _tmpltMgr.delete(callerUserId, template.getId(), null);
// Fix 1: Prevent boolean overwriting by checking failure explicitly
if (!_tmpltMgr.delete(callerUserId, template.getId(), null)) {
logger.warn("TemplateManager returned false when deleting template {} for account {}", template, account);
allTemplatesDeleted = false;
}
} catch (Exception e) {
logger.warn("Failed to delete template {} while removing account {} due to: ", template, account, e);
logger.warn("Failed to delete template {} while removing account {} due to exception: ", template, account, e);
allTemplatesDeleted = false;
}
}
Expand Down