Daniel Erez has uploaded a new change for review. Change subject: core: filter shareable disks on preview snapshot ......................................................................
core: filter shareable disks on preview snapshot TryBackToAllSnapshotsOfVm -> getImagesToPreview: filter out shareable/nonsnapable disks. Change-Id: I232d3387e203933bdbb12a5e3401c096278a41d3 Bug-Url: https://bugzilla.redhat.com/1161916 Signed-off-by: Daniel Erez <de...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/TryBackToAllSnapshotsOfVmCommand.java 1 file changed, 7 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/13/35013/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/TryBackToAllSnapshotsOfVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/TryBackToAllSnapshotsOfVmCommand.java index 087fb62..9fcd4a6 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/TryBackToAllSnapshotsOfVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/TryBackToAllSnapshotsOfVmCommand.java @@ -123,7 +123,7 @@ snapshotsManager.attempToRestoreVmConfigurationFromSnapshot(getVm(), getDstSnapshot(), getSnapshotDao().getId(getVm().getId(), SnapshotType.ACTIVE), - getParameters().getDisks(), + getImagesToPreview(), getCompensationContext(), getVm().getVdsGroupCompatibilityVersion(), getCurrentUser()); } @@ -217,8 +217,12 @@ } private List<DiskImage> getImagesToPreview() { - return getParameters().getDisks() != null ? getParameters().getDisks() : - getDbFacade().getDiskImageDao().getAllSnapshotsForVmSnapshot(getDstSnapshot().getId()); + if (getParameters().getDisks() == null) { + getParameters().setDisks( + getDbFacade().getDiskImageDao().getAllSnapshotsForVmSnapshot(getDstSnapshot().getId())); + } + // Filter out shareable/nonsnapable disks + return ImagesHandler.filterImageDisks(getParameters().getDisks(), true, true, false); } /** -- To view, visit http://gerrit.ovirt.org/35013 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I232d3387e203933bdbb12a5e3401c096278a41d3 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Daniel Erez <de...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
