[Engine-patches] Change in ovirt-engine[ovirt-engine-3.5-gluster]: engine : Fixes geo-rep issues

[sabose]

Hello anmolbabu,

I'd like you to do a code review.  Please visit

    https://gerrit.ovirt.org/40226

to review the following change.

Change subject: engine : Fixes geo-rep issues
......................................................................

engine : Fixes geo-rep issues

This patch fixes the following issues:
1. Fixes the xml parsing logic in GlusterHostsPubKeyReturnForXmlRpc
   for json mode.
2. hostname and username separated
3. When masterVolumeId was not set, use volumeId passed in parameter.

Change-Id: I925815c663be810cedb2cd7df81032d24ea8286c
Signed-off-by: Anmol Babu <anb...@redhat.com>
---
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/StartGlusterVolumeGeoRepCommand.java
M 
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterHostsPubKeyReturnForXmlRpc.java
M 
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterVolumeGeoRepStatusForXmlRpc.java
3 files changed, 8 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/26/40226/1

diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/StartGlusterVolumeGeoRepCommand.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/StartGlusterVolumeGeoRepCommand.java
index 1480003..fc5bee7 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/StartGlusterVolumeGeoRepCommand.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/StartGlusterVolumeGeoRepCommand.java
@@ -42,7 +42,6 @@
 
     @Override
     protected boolean canDoAction() {
-        setGlusterVolumeId(getGeoRepSession().getMasterVolumeId());
         if (!super.canDoAction()) {
             return false;
         }
diff --git 
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterHostsPubKeyReturnForXmlRpc.java
 
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterHostsPubKeyReturnForXmlRpc.java
index 3f371fd..90e03af 100644
--- 
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterHostsPubKeyReturnForXmlRpc.java
+++ 
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterHostsPubKeyReturnForXmlRpc.java
@@ -9,12 +9,16 @@
 public class GlusterHostsPubKeyReturnForXmlRpc extends StatusReturnForXmlRpc {
 
     private List<String> geoRepPublicKeys = null;
+    private static final String INFO = "info";
 
     private static final String GEO_REP_PUB_KEYS = "geoRepPubKeys";
 
     @SuppressWarnings("unchecked")
     public GlusterHostsPubKeyReturnForXmlRpc(Map<String, Object> innerMap) {
         super(innerMap);
+        if(innerMap.containsKey("info")) {
+            innerMap = (Map<String, Object>) innerMap.get(INFO);
+        }
         if (innerMap.containsKey(GEO_REP_PUB_KEYS)) {
             Object[] keys = (Object[]) innerMap.get(GEO_REP_PUB_KEYS);
             for (Object key : keys) {
diff --git 
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterVolumeGeoRepStatusForXmlRpc.java
 
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterVolumeGeoRepStatusForXmlRpc.java
index e27faa5..8a91f14 100644
--- 
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterVolumeGeoRepStatusForXmlRpc.java
+++ 
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterVolumeGeoRepStatusForXmlRpc.java
@@ -75,6 +75,10 @@
         String sessionKey = (String) innerMap.get(SESSION_KEY);
         String sessSplit[] = sessionKey.split("([://]+)");
         String slaveNode = sessSplit[sessSplit.length - 2];
+        if(slaveNode.contains("@")) {
+            String[] hostComponents = slaveNode.split("@");
+            slaveNode = hostComponents[hostComponents.length - 1];
+        }
         String slaveVolume = (String) innerMap.get(REMOTE_VOL_NAME);
         geoRepSession.setSlaveHostName(slaveNode);
         geoRepSession.setSlaveVolumeName(slaveVolume);


-- 
To view, visit https://gerrit.ovirt.org/40226
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I925815c663be810cedb2cd7df81032d24ea8286c
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.5-gluster
Gerrit-Owner: Sahina Bose <sab...@redhat.com>
Gerrit-Reviewer: anmolbabu <anb...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches