Maor Lipchuk has uploaded a new change for review. Change subject: core: Avoid filtering Cinder disks for snapshot validation. ......................................................................
core: Avoid filtering Cinder disks for snapshot validation. Add also Cinder disks to the disks list to validate for creating a snapshot. Change the private method name to be more appropriate. Change-Id: I15dde8ae90f7e5b3bbc73d982dbc2eb72fbce414 Bug-Url: https://bugzilla.redhat.com/?????? Signed-off-by: Maor Lipchuk <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateAllSnapshotsFromVmCommand.java 1 file changed, 9 insertions(+), 7 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/79/40979/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateAllSnapshotsFromVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateAllSnapshotsFromVmCommand.java index 100cf4d..b02969c 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateAllSnapshotsFromVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateAllSnapshotsFromVmCommand.java @@ -117,7 +117,7 @@ */ protected List<DiskImage> getDisksList() { if (cachedSelectedActiveDisks == null) { - List<DiskImage> imagesAndCinderForVm = getDiskImagesAndCinder(); + List<DiskImage> imagesAndCinderForVm = getFilteredDisksForSnapshot(); // Get disks from the specified parameters or according to the VM if (getParameters().getDisks() == null) { @@ -125,18 +125,18 @@ } else { // Get selected images from 'DiskImagesForVm' to ensure disks entities integrity - // (i.e. only images' IDs are relevant). + // (i.e. only images' IDs and Cinders' IDs are relevant). cachedSelectedActiveDisks = ImagesHandler.imagesIntersection(imagesAndCinderForVm, getParameters().getDisks()); } } return cachedSelectedActiveDisks; } - private List<DiskImage> getDiskImagesAndCinder() { - List<DiskImage> imagesForVm = getDiskImagesForVm(); - List<CinderDisk> cinderImages = ImagesHandler.filterDisksBasedOnCinder(DbFacade.getInstance().getDiskDao().getAllForVm(getVmId())); - imagesForVm.addAll(cinderImages); - return imagesForVm; + private List<DiskImage> getFilteredDisksForSnapshot() { + List<DiskImage> filteredDisksForSnapshot = getDiskImagesForVm(); + List<CinderDisk> cinderDisks = ImagesHandler.filterDisksBasedOnCinder(DbFacade.getInstance().getDiskDao().getAllForVm(getVmId())); + filteredDisksForSnapshot.addAll(cinderDisks); + return filteredDisksForSnapshot; } protected List<DiskImage> getDisksListForChecks() { @@ -158,6 +158,8 @@ private boolean validateStorage() { List<DiskImage> vmDisksList = getDisksListForChecks(); if (vmDisksList.size() > 0) { + // TODO: We should have a validator factory for Cinder and image disks. This should be after the refacor of + // disks. DiskImagesValidator diskImagesValidator = createDiskImageValidator(vmDisksList); if (!(validate(diskImagesValidator.diskImagesNotLocked()) && validate(diskImagesValidator.diskImagesNotIllegal()))) { -- To view, visit https://gerrit.ovirt.org/40979 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I15dde8ae90f7e5b3bbc73d982dbc2eb72fbce414 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Maor Lipchuk <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
