Change in ovirt-engine[master]: core: Fix storage allocation check when merging a snapshot

[amureini at redhat.com]

Allon Mureinik 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 at 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/37014
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I41213884ed0ca9ddf8354ab7be58f032a6d90673
Gerrit-PatchSet: 8
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Vered Volansky <vvolansk at redhat.com>
Gerrit-Reviewer: Ala Hino <ahino at redhat.com>
Gerrit-Reviewer: Allon Mureinik <amureini at redhat.com>
Gerrit-Reviewer: Amit Aviram <aaviram at redhat.com>
Gerrit-Reviewer: Candace Sheremeta <cshereme at redhat.com>
Gerrit-Reviewer: Freddy Rolland <frolland at redhat.com>
Gerrit-Reviewer: Idan Shaby <ishaby at redhat.com>
Gerrit-Reviewer: Tal Nisan <tnisan at redhat.com>
Gerrit-Reviewer: Vered Volansky <vvolansk at redhat.com>
Gerrit-Reviewer: automation at ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server