Allon Mureinik has uploaded a new change for review. Change subject: core: Remove checkImagesLocked(vmId, messages) ......................................................................
core: Remove checkImagesLocked(vmId, messages) Removed ImagesHandler.checkImagesLocked(Guid vmId, List<String messages), as ImagesHandler should not know about VMs. Wherever in was used (two places - AddVmFromSnapshot and LiveMigrateVmDisks), it was replaced with a direct call to DiskDao and then a simpler call to ImagesHandler.checkImagesLocked (messages, disks). Change-Id: Iae603af05f4b90e8c021113779031846a56c99ff Signed-off-by: Allon Mureinik <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromSnapshotCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImagesHandler.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/LiveMigrateVmDisksCommand.java 3 files changed, 11 insertions(+), 15 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/00/14100/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromSnapshotCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromSnapshotCommand.java index 12ef150..af6d114 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromSnapshotCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromSnapshotCommand.java @@ -276,7 +276,9 @@ return false; } - if (!ImagesHandler.checkImagesLocked(getSourceVmFromDb().getId(), getReturnValue().getCanDoActionMessages())) { + List<DiskImage> disksToCheck = + ImagesHandler.filterImageDisks(getDiskDao().getAllForVm(getSourceVmFromDb().getId()), true, false); + if (!ImagesHandler.checkImagesLocked(getReturnValue().getCanDoActionMessages(), disksToCheck)) { return false; } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImagesHandler.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImagesHandler.java index 28008bf..5c9d920 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImagesHandler.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImagesHandler.java @@ -476,11 +476,7 @@ return returnValue; } - public static boolean checkImagesLocked(Guid vmId, List<String> messages) { - return checkImagesLocked(messages, getImages(vmId, null)); - } - - private static boolean checkImagesLocked(List<String> messages, List<DiskImage> images) { + public static boolean checkImagesLocked(List<String> messages, List<DiskImage> images) { return checkImagesNotInStatus(messages, images, ImageStatus.LOCKED, VdcBllMessages.ACTION_TYPE_FAILED_DISKS_LOCKED); } @@ -505,14 +501,6 @@ } return returnValue; - } - - private static List<DiskImage> getImages(Guid vmId, Collection<? extends Disk> diskImageList) { - if (diskImageList == null) { - return filterImageDisks(DbFacade.getInstance().getDiskDao().getAllForVm(vmId), true, false); - } - - return filterImageDisks(diskImageList, true, false); } private static boolean checkDiskImages(List<String> messages, 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 f620a88..cad601f 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 @@ -33,6 +33,7 @@ import org.ovirt.engine.core.common.utils.Pair; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.dal.VdcBllMessages; +import org.ovirt.engine.core.dao.DiskDao; import org.ovirt.engine.core.dao.DiskImageDAO; import org.ovirt.engine.core.dao.StorageDomainDAO; import org.ovirt.engine.core.utils.collections.MultiValueMapUtils; @@ -120,6 +121,10 @@ } return vm; + } + + protected DiskDao getDiskDao() { + return getDbFacade().getDiskDao(); } protected DiskImageDAO getDiskImageDao() { @@ -213,7 +218,8 @@ } protected boolean checkImagesStatus() { - return ImagesHandler.checkImagesLocked(getVmId(), getReturnValue().getCanDoActionMessages()); + List<DiskImage> disksToCheck = ImagesHandler.filterImageDisks(getDiskDao().getAllForVm(getVmId()), true, false); + return ImagesHandler.checkImagesLocked(getReturnValue().getCanDoActionMessages(), disksToCheck); } private boolean isDiskNotShareable(Guid imageId) { -- To view, visit http://gerrit.ovirt.org/14100 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iae603af05f4b90e8c021113779031846a56c99ff Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
