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

Call Image.reconcileVolumeChain instead of VM.reconcileVolumeChain.  The
former, undefined verb would lead to failure to recover live mege
operations if the merge was interrupted e.g. by host shutdown.

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, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/17/35017/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 8acff02..e22cbde 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,7 +163,7 @@
     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)


-- 
To view, visit http://gerrit.ovirt.org/35017
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If1b23580ae6023754d2e02000dc5913262b3ef8b
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Greg Padgett <gpadg...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches

Reply via email to