Tal Nisan has submitted this change and it was merged. Change subject: core: Live Merge's check for merge completion is wrong ...................................................................... core: Live Merge's check for merge completion is wrong When the DESTROY_IMAGE_CHECK step was added to the Live Merge flow, the completedMerge() method was not updated. This method is called upon failure and checks if the merge operation was completed based on the current command step. Without this, a failure during the DESTROY_IMAGE_CHECK step will result in live merge updating the database in such a way that recovery will retry the merge operation, requiring manual intervention to repair. This patch also includes a change to a log message so that it is possible to tell which database updates the flow performed based on the result of completedMerge(). Change-Id: Ia20aab2233493b8653c6a714c8504964f8196878 Bug-Url: https://bugzilla.redhat.com/1306367 Signed-off-by: Greg Padgett <gpadgett@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotSingleDiskLiveCommand.java 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Greg Padgett: Verified Jenkins CI: Passed CI tests Allon Mureinik: Looks good to me, approved Ala Hino: Looks good to me, but someone else must approve -- To view, visit https://gerrit.ovirt.org/53439 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia20aab2233493b8653c6a714c8504964f8196878 Gerrit-PatchSet: 2 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.6.3 Gerrit-Owner: Greg Padgett <gpadgett@redhat.com> Gerrit-Reviewer: Ala Hino <ahino@redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini@redhat.com> Gerrit-Reviewer: Greg Padgett <gpadgett@redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Tal Nisan <tnisan@redhat.com> Gerrit-Reviewer: gerrit-hooks <automation@ovirt.org>