Daniel Erez has uploaded a new change for review. Change subject: core: RemoveVM - clear snapshot_id from detached disks ......................................................................
core: RemoveVM - clear snapshot_id from detached disks Clearing snapshot_id from detached disk images when removing a VM. Change-Id: I03fe42fd16067ceda87027b96948e746d0045229 Bug-Url: https://bugzilla.redhat.com/1015170 Signed-off-by: Daniel Erez <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java 2 files changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/00/20000/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmCommand.java index 35ae0d2..d0588c8 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmCommand.java @@ -99,6 +99,11 @@ } getCompensationContext().stateChanged(); } + else { + for (DiskImage image : diskImages) { + getImageDao().updateImageVmSnapshotId(image.getImageId(), null); + } + } return null; } }); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java index 2dc56d8..444939d 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java @@ -34,6 +34,7 @@ import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.dao.DiskDao; import org.ovirt.engine.core.dao.DiskImageDAO; +import org.ovirt.engine.core.dao.ImageDao; import org.ovirt.engine.core.dao.TagDAO; import org.ovirt.engine.core.dao.VmDeviceDAO; import org.ovirt.engine.core.dao.VmDynamicDAO; @@ -437,6 +438,10 @@ return getDbFacade().getDiskImageDao(); } + protected ImageDao getImageDao() { + return getDbFacade().getImageDao(); + } + protected boolean checkPayload(VmPayload payload, String isoPath) { boolean returnValue = true; if (payload.getType() != VmDeviceType.CDROM && payload.getType() != VmDeviceType.FLOPPY) { -- To view, visit http://gerrit.ovirt.org/20000 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I03fe42fd16067ceda87027b96948e746d0045229 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.3 Gerrit-Owner: Daniel Erez <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
