ofri masad has uploaded a new change for review. Change subject: core: Fix quota release for Remove-Template ......................................................................
core: Fix quota release for Remove-Template Quota resources are not released when deleting a template. This happened because the template disk list was not initialized before the quota consumption parameters check. Added initialization of the list when before quota consumption parameters check. Change-Id: Iaf9326bfb81df2cdf1132f693d30014056df5d66 Bug-Url: https://bugzilla.redhat.com/913452 Signed-off-by: Ofri Masad <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmTemplateCommand.java 1 file changed, 11 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/96/12396/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmTemplateCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmTemplateCommand.java index 8bc977c..da0c373 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmTemplateCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmTemplateCommand.java @@ -85,10 +85,7 @@ return false; } - imageTemplates = - ImagesHandler.filterImageDisks(DbFacade.getInstance().getDiskDao().getAllForVm(getVmTemplateId()), - false, - false); + fetchImageTemplates(); List<Guid> storageDomainsList = getParameters().getStorageDomainsList(); Set<Guid> allDomainsList = getStorageDoaminsByDisks(imageTemplates, true); @@ -160,6 +157,15 @@ } return true; + } + + private void fetchImageTemplates() { + if (imageTemplates == null) { + imageTemplates = + ImagesHandler.filterImageDisks(DbFacade.getInstance().getDiskDao().getAllForVm(getVmTemplateId()), + false, + false); + } } /** @@ -274,7 +280,7 @@ @Override public List<QuotaConsumptionParameter> getQuotaStorageConsumptionParameters() { List<QuotaConsumptionParameter> list = new ArrayList<QuotaConsumptionParameter>(); - + fetchImageTemplates(); if (imageTemplates != null) { for (DiskImage disk : imageTemplates) { if (disk.getQuotaId() != null && !Guid.Empty.equals(disk.getQuotaId())) { -- To view, visit http://gerrit.ovirt.org/12396 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iaf9326bfb81df2cdf1132f693d30014056df5d66 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: ofri masad <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
