Tal Nisan has submitted this change and it was merged. Change subject: core: Fix errors for retry of failed DestroyImageCommand ...................................................................... core: Fix errors for retry of failed DestroyImageCommand Fix issues encountered while re-executing Live Merge after a failure of DestroyImageCommand: 1. Some images may have been marked illegal from a prior failure; this is an expected condition so allow live merge execution in this case. 2. The endSuccessfully and endWithFailure methods should always indicate their own success using setSucceeded(true) to avoid endAction retries. 3. If the DestroyImage SPM async task was started and converged before CoCo called doPolling() again on RemoveSnapshotSingleDiskLive, the child command list was not updated. Subsequently the end action methods were not able to call endAction on DestroyImageCommand and no commands in the Live Merge command tree would converge. This is fixed by updating the child command list before referencing it to ensure all children are present. Change-Id: Icbbcc30fa035de82de05c5c60ce224ed36aee831 Related-To: https://bugzilla.redhat.com/1213157 Signed-off-by: Greg Padgett <gpadgett(a)redhat.com&gt; --- 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/RemoveSnapshotSingleDiskLiveCommand.java 2 files changed, 38 insertions(+), 21 deletions(-) Approvals: Greg Padgett: Verified Jenkins CI: Looks good to me, but someone else must approve Allon Mureinik: Looks good to me, approved -- To view, visit https://gerrit.ovirt.org/40453 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icbbcc30fa035de82de05c5c60ce224ed36aee831 Gerrit-PatchSet: 3 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Greg Padgett <gpadgett(a)redhat.com&gt; Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com&gt; Gerrit-Reviewer: Greg Padgett <gpadgett(a)redhat.com&gt; Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com&gt;