Change in ovirt-engine[ovirt-engine-3.5]: core: allow successful retries of Live Merge

[oourfali at redhat.com]

Oved Ourfali has submitted this change and it was merged.

Change subject: core: allow successful retries of Live Merge
......................................................................


core: allow successful retries of Live Merge

Change RemoveSnapshotSingleDiskLiveCommand and related commands to
allow for successful retries after deletion or merge fails.

Upon merge failure, images are marked illegal but remain in the volume
chain.  Retries will start over and attempt to merge the images again.

Upon deletion failure (but after a successful merge), the volume chain
is updated to reflect the new chain; however, the orphaned images are
re-associated with the snapshot to be deleted, marked illegal, and set
to have no parents or children.  Upon retry, the command will detect
this state and skip to the DESTROY_IMAGE execution step.

Change-Id: Ib794822c6b03cb05e00dc7e99113127aaed43ce9
Bug-Url: https://bugzilla.redhat.com/1122691
Related-To: https://bugzilla.redhat.com/1083310
Signed-off-by: Greg Padgett <gpadgett at redhat.com>
---
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotCommand.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotCommandCallback.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotSingleDiskLiveCommand.java
3 files changed, 161 insertions(+), 26 deletions(-)

Approvals:
  Greg Padgett: Verified
  Allon Mureinik: Looks good to me, approved



-- 
To view, visit http://gerrit.ovirt.org/30605
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib794822c6b03cb05e00dc7e99113127aaed43ce9
Gerrit-PatchSet: 3
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.5
Gerrit-Owner: Greg Padgett <gpadgett at redhat.com>
Gerrit-Reviewer: Allon Mureinik <amureini at redhat.com>
Gerrit-Reviewer: Greg Padgett <gpadgett at redhat.com>
Gerrit-Reviewer: Oved Ourfali <oourfali at redhat.com>
Gerrit-Reviewer: automation at ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server