Gilad Chaplik has uploaded a new change for review. Change subject: core: No validation for disk space (#828334) ......................................................................
core: No validation for disk space (#828334) https://bugzilla.redhat.com/828334 In AddVmTemplate command there was no validation for remaining disk space, and the command was sent to the VDSM in spite that. The problem was that the check was performed on the template instead of the VM that whom we're going to create template from. Change-Id: Id8f4c73f7e09d4a6c2ae475f979bdc11116b6b4d Signed-off-by: Gilad Chaplik <gchap...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/StorageDomainValidator.java 2 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/67/7367/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java index 5fe1f2d..144bdd1 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java @@ -249,7 +249,7 @@ Map<storage_domains, Integer> domainMap = StorageDomainValidator.getSpaceRequirementsForStorageDomains( - getVmTemplate().getDiskImageMap().values(), + ImagesHandler.filterImageDisks(getVm().getDiskMap().values(), false, false), storageDomains, diskInfoDestinationMap); for (Map.Entry<storage_domains, Integer> entry : domainMap.entrySet()) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/StorageDomainValidator.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/StorageDomainValidator.java index 2e61930..588ea8a 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/StorageDomainValidator.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/StorageDomainValidator.java @@ -46,7 +46,7 @@ Map<Guid, storage_domains> storageDomains, Map<Guid, DiskImage> imageToDestinationDomainMap) { Map<DiskImage, storage_domains> spaceMap = new HashMap<DiskImage, storage_domains>(); for (DiskImage image : images) { - Guid storageId = imageToDestinationDomainMap.get(image.getImageId()).getstorage_ids().get(0); + Guid storageId = imageToDestinationDomainMap.get(image.getId()).getstorage_ids().get(0); storage_domains domain = storageDomains.get(storageId); if (domain == null) { domain = DbFacade.getInstance().getStorageDomainDAO().get(storageId); @@ -61,7 +61,7 @@ if (!imageToDomainMap.isEmpty()) { for (Map.Entry<DiskImage, storage_domains> entry : imageToDomainMap.entrySet()) { storage_domains domain = entry.getValue(); - int size = (int) entry.getKey().getActualDiskWithSnapshotsSize(); + int size = (int) entry.getKey().getActualSize(); if (map.containsKey(domain)) { map.put(domain, map.get(domain) + size); } else { -- To view, visit http://gerrit.ovirt.org/7367 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id8f4c73f7e09d4a6c2ae475f979bdc11116b6b4d Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Gilad Chaplik <gchap...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
