Vered Volansky has uploaded a new change for review. Change subject: core: confirm storage allocation validation ......................................................................
core: confirm storage allocation validation StorageDomainValidator.hasSpaceForClonedDisks() was introduced to the system in commit 53b5eba699a695edc5b2e963e28b43ea5290b299 in order to align all storage allocation checks throughout the system. This patch applies above validation instead of the existing one. Change-Id: I886967b7c2dadbbd301eadbea0c7eac9992aba08 Signed-off-by: Vered Volansky <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/LiveMigrateVmDisksCommand.java 1 file changed, 8 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/91/28891/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/LiveMigrateVmDisksCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/LiveMigrateVmDisksCommand.java index 0ed7b58..2f033be 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/LiveMigrateVmDisksCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/LiveMigrateVmDisksCommand.java @@ -394,17 +394,15 @@ return false; } - long totalImagesSize = 0; for (DiskImage diskImage : disksList) { Guid templateId = diskImage.getImageTemplateId(); List<DiskImage> allImageSnapshots = ImagesHandler.getAllImageSnapshots(diskImage.getImageId(), templateId); diskImage.getSnapshots().addAll(allImageSnapshots); - totalImagesSize += Math.round(diskImage.getActualDiskWithSnapshotsSize()); } - if (!doesStorageDomainhaveSpaceForRequest(destDomain, totalImagesSize)) { + if (!doesStorageDomainHasSpaceForRequest(destDomain, disksList)) { return false; } } @@ -420,8 +418,9 @@ return validate(new StorageDomainValidator(storageDomain).isDomainWithinThresholds()); } - protected boolean doesStorageDomainhaveSpaceForRequest(StorageDomain storageDomain, long totalImagesSize) { - return validate(new StorageDomainValidator(storageDomain).isDomainHasSpaceForRequest(totalImagesSize)); + protected boolean doesStorageDomainHasSpaceForRequest(StorageDomain storageDomain, List<DiskImage> disksList) { + StorageDomainValidator storageDomainValidator = createStorageDomainValidator(storageDomain); + return validate(storageDomainValidator.hasSpaceForClonedDisks(disksList)); } private boolean performVmRelatedChecks() { @@ -444,4 +443,8 @@ protected DiskValidator createDiskValidator(Disk disk) { return new DiskValidator(disk); } + + protected StorageDomainValidator createStorageDomainValidator(StorageDomain storageDomain) { + return new StorageDomainValidator(storageDomain); + } } -- To view, visit http://gerrit.ovirt.org/28891 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I886967b7c2dadbbd301eadbea0c7eac9992aba08 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.4 Gerrit-Owner: Vered Volansky <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
