Daniel Erez has submitted this change and it was merged. Change subject: core: Live Merge recovery flow ...................................................................... core: Live Merge recovery flow When a VM stops running during a live merge, check the status using a new reconcileVolumeChain vdsm verb. This verb will ensure the volume chain is correct and return the comprising images, which we can then use to converge the Live Merge flow while the VM is still down. Change-Id: Ie858c69412698e9a11a7f52ee88c3c078b3f2303 Bug-Url: https://bugzilla.redhat.com/1129898 Signed-off-by: Greg Padgett <gpadgett(a)redhat.com&gt; --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MergeCommandCallback.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MergeStatusCommand.java A backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MergeStatusCommandCallback.java A backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ReconcileVolumeChainVDSCommandParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSCommandType.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IIrsServer.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsServerConnector.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsServerWrapper.java A backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/ReconcileVolumeChainVDSCommand.java A backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/VolumeListReturnForXmlRpc.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/JsonRpcIIrsServer.java 11 files changed, 192 insertions(+), 14 deletions(-) Approvals: Greg Padgett: Verified Daniel Erez: Looks good to me, approved Allon Mureinik: Looks good to me, but someone else must approve -- To view, visit http://gerrit.ovirt.org/31850 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie858c69412698e9a11a7f52ee88c3c078b3f2303 Gerrit-PatchSet: 6 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Greg Padgett <gpadgett(a)redhat.com&gt; Gerrit-Reviewer: Adam Litke <alitke(a)redhat.com&gt; Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com&gt; Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com&gt; Gerrit-Reviewer: Federico Simoncelli <fsimonce(a)redhat.com&gt; Gerrit-Reviewer: Greg Padgett <gpadgett(a)redhat.com&gt; Gerrit-Reviewer: automation(a)ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server