Greg Padgett has uploaded a new change for review. Change subject: core: Fix Live Merge recovery with JSON-RPC hosts ......................................................................
core: Fix Live Merge recovery with JSON-RPC hosts JSON-RPC calls to the reconcileVolumeChain verb were not done correctly, causing recovery to fail if live merge was interrupted by e.g. host shutdown during the merge operation. Change-Id: If1b23580ae6023754d2e02000dc5913262b3ef8b Bug-Url: https://bugzilla.redhat.com/1161127 Signed-off-by: Greg Padgett <gpadg...@redhat.com> --- M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/JsonRpcIIrsServer.java 1 file changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/77/35577/1 diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/JsonRpcIIrsServer.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/JsonRpcIIrsServer.java index df1b1ce..dd0c7b4 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/JsonRpcIIrsServer.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/JsonRpcIIrsServer.java @@ -163,12 +163,14 @@ public VolumeListReturnForXmlRpc reconcileVolumeChain(String spUUID, String sdUUID, String imgGUID, String leafVolUUID) { JsonRpcRequest request = - new RequestBuilder("VM.reconcileVolumeChain").withParameter("storagepoolID", spUUID) + new RequestBuilder("Image.reconcileVolumeChain").withParameter("storagepoolID", spUUID) .withParameter("storagedomainID", sdUUID) .withParameter("imageID", imgGUID) .withParameter("leafVolID", leafVolUUID) .build(); - Map<String, Object> response = new FutureMap(this.client, request); + Map<String, Object> response = + new FutureMap(this.client, request).withResponseKey("volumes") + .withResponseType(Object[].class); return new VolumeListReturnForXmlRpc(response); } -- To view, visit http://gerrit.ovirt.org/35577 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If1b23580ae6023754d2e02000dc5913262b3ef8b Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Greg Padgett <gpadg...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
