Tal Nisan has submitted this change and it was merged. Change subject: core: Fix storage allocation check when merging a snapshot ...................................................................... core: Fix storage allocation check when merging a snapshot When merging a snapshot we need extra available space for the snapshot being removed, plus this snapshot's child (the one on top of the deleted one). This patch takes the child-snapshot's size into consideration. Change-Id: I41213884ed0ca9ddf8354ab7be58f032a6d90673 Bug-Url: https://bugzilla.redhat.com/1178010 Bug-Url: https://bugzilla.redhat.com/1053733 Signed-off-by: Vered Volansky <vvolansk@redhat.com> --- 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/RemoveDiskSnapshotsCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotCommand.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RemoveDiskSnapshotsCommandTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RemoveSnapshotCommandTest.java 5 files changed, 81 insertions(+), 145 deletions(-) Approvals: Allon Mureinik: Looks good to me, approved Vered Volansky: Verified -- To view, visit http://gerrit.ovirt.org/37255 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I41213884ed0ca9ddf8354ab7be58f032a6d90673 Gerrit-PatchSet: 4 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Vered Volansky <vvolansk@redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini@redhat.com> Gerrit-Reviewer: Tal Nisan <tnisan@redhat.com> Gerrit-Reviewer: Vered Volansky <vvolansk@redhat.com> Gerrit-Reviewer: automation@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server