Vered Volansky has uploaded a new change for review. Change subject: core: Fix import from glance storage allocation check ......................................................................
core: Fix import from glance storage allocation check The storage allocation check uses the DiskImage.getActualDiskWithSnapshotsSizeInBytes() method to evaluate the disk's size according to it's snapshots' sizes. In this case, the disk image is not created with an active image (which is considered as a snapshot for the aforementioned method), which resulted in a disk size of 0. This patch adds the image to the snapshots. Change-Id: I02d1cfb30c64a7d7b7b4c0386b134583faee190d Bug-Url: https://bugzilla.redhat.com/1178012 Signed-off-by: Vered Volansky <vvola...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportRepoImageCommand.java 1 file changed, 6 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/05/37505/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportRepoImageCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportRepoImageCommand.java index cbcfdf4..89a4e61 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportRepoImageCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportRepoImageCommand.java @@ -250,14 +250,18 @@ return failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_DISK_NOT_EXIST); } + return validateSpaceRequirements(diskImage); } protected boolean validateSpaceRequirements(DiskImage diskImage) { + diskImage.getSnapshots().add(diskImage); // Added for validation purposes. StorageDomainValidator sdValidator = createStorageDomainValidator(); - return (validate(sdValidator.isDomainExistAndActive()) - && validate(sdValidator.isDomainWithinThresholds())) + boolean result = validate(sdValidator.isDomainExistAndActive()) + && validate(sdValidator.isDomainWithinThresholds()) && validate(sdValidator.hasSpaceForClonedDisk(diskImage)); + diskImage.getSnapshots().remove(diskImage); + return result; } protected StorageDomainValidator createStorageDomainValidator() { -- To view, visit http://gerrit.ovirt.org/37505 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I02d1cfb30c64a7d7b7b4c0386b134583faee190d Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Vered Volansky <vvola...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
