Change in ovirt-engine[master]: core: Live Merge recovery flow

[derez at redhat.com]

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 at redhat.com>
---
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 at redhat.com>
Gerrit-Reviewer: Adam Litke <alitke at redhat.com>
Gerrit-Reviewer: Allon Mureinik <amureini at redhat.com>
Gerrit-Reviewer: Daniel Erez <derez at redhat.com>
Gerrit-Reviewer: Federico Simoncelli <fsimonce at redhat.com>
Gerrit-Reviewer: Greg Padgett <gpadgett at redhat.com>
Gerrit-Reviewer: automation at ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server