anmolbabu has uploaded a new change for review.
Change subject: engine, webadmin: use slave host id instead of slave host name
......................................................................
engine, webadmin: use slave host id instead of slave host name
The canDoAction of create georep session command checks if
host is monitored by engine and tries to get host based on the
passed host details.
Previously,this used to be obtained using host name and UI
used to pass the host name which is VDS#getName but the
backend expected dns resolvable name which is provided by
VDS#getHostName. The UI can't pass VDS#getHostName because
its not available in there. The UI lists vds as obtained from
the bricks of eligible/non-eligible volumes. The volume can
provide only brick servernames and server ids.
So, its better to obtain vds based on its id rather than on
name.
The above reasons required this change to be introduced.
Change-Id: I4440eddbc2616c7ca89feaae3ba0e67d93562213
Signed-off-by: Anmol Babu <anb...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/CreateGlusterVolumeGeoRepSessionCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GeoRepSessionCommandBase.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/CreateGlusterVolumeGeoRepSessionCommandTest.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/gluster/GlusterVolumeGeoRepSessionParameters.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/gluster/GlusterGeoRepDao.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/gluster/GlusterGeoRepDaoDbFacadeImpl.java
M
backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/gluster/GlusterGeoRepDaoTest.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/GlusterVolumeGeoRepCreateModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeGeoRepListModel.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/GlusterVolumeGeoRepCreateSessionPopupView.java
M packaging/dbscripts/gluster_georep_sp.sql
11 files changed, 53 insertions(+), 48 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/17/40417/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/CreateGlusterVolumeGeoRepSessionCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/CreateGlusterVolumeGeoRepSessionCommand.java
index cf13eba..03c60e0 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/CreateGlusterVolumeGeoRepSessionCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/CreateGlusterVolumeGeoRepSessionCommand.java
@@ -71,7 +71,7 @@
}
GlusterGeoRepSession geoRepSession =
getGeoRepDao().getGeoRepSession(getGlusterVolumeId(),
- getParameters().getSlaveHost(),
+ slaveHost.getId(),
getParameters().getSlaveVolumeName());
if (geoRepSession != null) {
return
failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_GLUSTER_GEOREP_SESSION_ALREADY_CREATED);
@@ -89,7 +89,7 @@
}
protected VDS getSlaveHost() {
- return getVdsDAO().getByName(getParameters().getSlaveHost());
+ return getVdsDAO().get(getParameters().getSlaveHostId());
}
private boolean areAllRemoteServersUp() {
@@ -205,7 +205,7 @@
GlusterVolumeGeoRepSessionVDSParameters params =
new GlusterVolumeGeoRepSessionVDSParameters(upServer.getId(),
getGlusterVolumeName(),
- getParameters().getSlaveHost(),
+ slaveHost.getHostName(),
getParameters().getSlaveVolumeName(),
getParameters().getUserName(),
getParameters().isForce());
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GeoRepSessionCommandBase.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GeoRepSessionCommandBase.java
index e9b91d2..16e116f3 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GeoRepSessionCommandBase.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GeoRepSessionCommandBase.java
@@ -59,7 +59,7 @@
} else {
geoRepSession =
getGlusterGeoRepDao().getGeoRepSession(getGlusterVolumeId(),
- getParameters().getSlaveHost(),
+ getParameters().getSlaveHostId(),
getParameters().getSlaveVolumeName());
}
}
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/CreateGlusterVolumeGeoRepSessionCommandTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/CreateGlusterVolumeGeoRepSessionCommandTest.java
index ae72513..160be16 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/CreateGlusterVolumeGeoRepSessionCommandTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/CreateGlusterVolumeGeoRepSessionCommandTest.java
@@ -71,14 +71,14 @@
command =
spy(new CreateGlusterVolumeGeoRepSessionCommand(new
GlusterVolumeGeoRepSessionParameters(masterVolumeId,
slaveVolumeName,
- slaveHost,
+ Guid.newGuid(),
null,
null,
false)));
prepareMocks();
doReturn(SUPPORTED_VERSION).when(vdsGroup).getcompatibility_version();
doReturn(volume).when(command).getSlaveVolume();
- doReturn(null).when(geoRepDao).getGeoRepSession(any(Guid.class),
any(String.class), any(String.class));
+ doReturn(null).when(geoRepDao).getGeoRepSession(any(Guid.class),
any(Guid.class), any(String.class));
doReturn(vds).when(command).getSlaveHost();
assertTrue(command.canDoAction());
}
@@ -100,7 +100,7 @@
command =
spy(new CreateGlusterVolumeGeoRepSessionCommand(new
GlusterVolumeGeoRepSessionParameters(masterVolumeId,
slaveVolumeName,
- slaveHost,
+ Guid.newGuid(),
null,
null,
false)));
@@ -108,7 +108,7 @@
doReturn(null).when(command).getSlaveVolume();
doReturn(SUPPORTED_VERSION).when(vdsGroup).getcompatibility_version();
doReturn(vds).when(command).getSlaveHost();
- doReturn(null).when(geoRepDao).getGeoRepSession(any(Guid.class),
any(String.class), any(String.class));
+ doReturn(null).when(geoRepDao).getGeoRepSession(any(Guid.class),
any(Guid.class), any(String.class));
assertFalse(command.canDoAction());
}
@@ -117,7 +117,7 @@
command =
spy(new CreateGlusterVolumeGeoRepSessionCommand(new
GlusterVolumeGeoRepSessionParameters(masterVolumeId,
slaveVolumeName,
- slaveHost,
+ Guid.newGuid(),
null,
null,
false)));
@@ -126,7 +126,7 @@
doReturn(vds).when(command).getSlaveHost();
doReturn(SUPPORTED_VERSION).when(vdsGroup).getcompatibility_version();
doReturn(new
GlusterGeoRepSession()).when(geoRepDao).getGeoRepSession(any(Guid.class),
- any(String.class),
+ any(Guid.class),
any(String.class));
assertFalse(command.canDoAction());
}
@@ -136,7 +136,7 @@
command =
spy(new CreateGlusterVolumeGeoRepSessionCommand(new
GlusterVolumeGeoRepSessionParameters(Guid.newGuid(),
slaveVolumeName,
- slaveHost,
+ Guid.newGuid(),
null,
null,
false)));
@@ -145,7 +145,7 @@
doReturn(vds).when(command).getSlaveHost();
doReturn(NOT_SUPPORTED_VERSION).when(vdsGroup).getcompatibility_version();
doReturn(volume).when(command).getSlaveVolume();
- doReturn(null).when(geoRepDao).getGeoRepSession(any(Guid.class),
any(String.class), any(String.class));
+ doReturn(null).when(geoRepDao).getGeoRepSession(any(Guid.class),
any(Guid.class), any(String.class));
assertFalse(command.canDoAction());
}
@@ -154,7 +154,7 @@
command =
spy(new CreateGlusterVolumeGeoRepSessionCommand(new
GlusterVolumeGeoRepSessionParameters(masterVolumeId,
slaveVolumeName,
- slaveHost,
+ Guid.newGuid(),
null,
null,
false)));
@@ -162,7 +162,7 @@
doReturn(vds).when(command).getUpServer();
doReturn(SUPPORTED_VERSION).when(vdsGroup).getcompatibility_version();
doReturn(volume).when(command).getSlaveVolume();
- doReturn(null).when(geoRepDao).getGeoRepSession(any(Guid.class),
any(String.class), any(String.class));
+ doReturn(null).when(geoRepDao).getGeoRepSession(any(Guid.class),
any(Guid.class), any(String.class));
doReturn(null).when(command).getSlaveHost();
assertFalse(command.canDoAction());
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/gluster/GlusterVolumeGeoRepSessionParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/gluster/GlusterVolumeGeoRepSessionParameters.java
index eced882..f7e7043 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/gluster/GlusterVolumeGeoRepSessionParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/gluster/GlusterVolumeGeoRepSessionParameters.java
@@ -8,7 +8,7 @@
private Guid geoRepSessionId;
private String slaveVolumeName;
- private String slaveHost;
+ private Guid slaveHostId;
private String userName;
private String userGroup;
private boolean force;
@@ -22,29 +22,29 @@
this.geoRepSessionId = geoRepSessionId;
}
- public GlusterVolumeGeoRepSessionParameters(Guid volumeId, String
slaveVolumeName, String slaveHost) {
- this(volumeId, slaveVolumeName, slaveHost, "root", null, false);
+ public GlusterVolumeGeoRepSessionParameters(Guid volumeId, String
slaveVolumeName, Guid slaveHostId) {
+ this(volumeId, slaveVolumeName, slaveHostId, "root", null, false);
}
public GlusterVolumeGeoRepSessionParameters(Guid volumeId,
String slaveVolumeName,
- String slaveHost,
+ Guid slaveHostId,
String userName,
String userGroup,
boolean force) {
super(volumeId);
this.slaveVolumeName = slaveVolumeName;
- this.slaveHost = slaveHost;
+ this.slaveHostId = slaveHostId;
this.userName = userName;
this.userGroup = userGroup;
this.force = force;
}
public GlusterVolumeGeoRepSessionParameters(Guid volumeId, String
slaveVolumeName,
- String slaveHost,
+ Guid slaveHostId,
String userName,
String userGroup) {
- this(volumeId, slaveVolumeName, slaveHost, userName, userGroup, false);
+ this(volumeId, slaveVolumeName, slaveHostId, userName, userGroup,
false);
}
public String getSlaveVolumeName() {
@@ -55,12 +55,12 @@
this.slaveVolumeName = slaveVolumeName;
}
- public String getSlaveHost() {
- return slaveHost;
+ public Guid getSlaveHostId() {
+ return slaveHostId;
}
- public void setSlaveHost(String slaveHost) {
- this.slaveHost = slaveHost;
+ public void setSlaveHostId(Guid slaveHostId) {
+ this.slaveHostId = slaveHostId;
}
public boolean isForce() {
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/gluster/GlusterGeoRepDao.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/gluster/GlusterGeoRepDao.java
index 153fd1d..9a1a6f6 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/gluster/GlusterGeoRepDao.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/gluster/GlusterGeoRepDao.java
@@ -30,7 +30,7 @@
public GlusterGeoRepSession getGeoRepSession(String sessionKey);
- public GlusterGeoRepSession getGeoRepSession(Guid masterVolumeId, String
slaveHost, String slaveVolumeName);
+ public GlusterGeoRepSession getGeoRepSession(Guid masterVolumeId, Guid
slaveHostId, String slaveVolumeName);
public List<GlusterGeoRepSession> getGeoRepSessions(Guid masterVolumeId);
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/gluster/GlusterGeoRepDaoDbFacadeImpl.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/gluster/GlusterGeoRepDaoDbFacadeImpl.java
index dda1e49..385eee5 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/gluster/GlusterGeoRepDaoDbFacadeImpl.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/gluster/GlusterGeoRepDaoDbFacadeImpl.java
@@ -120,10 +120,10 @@
}
@Override
- public GlusterGeoRepSession getGeoRepSession(Guid masterVolumeId, String
slaveHost, String slaveVolumeName) {
+ public GlusterGeoRepSession getGeoRepSession(Guid masterVolumeId, Guid
slaveHostId, String slaveVolumeName) {
return
getCallsHandler().executeRead("GetGlusterGeoRepSessionBySlaveHostAndVolume",
georepSessionRowMapper,
getCustomMapSqlParameterSource().addValue("master_volume_id",
masterVolumeId)
- .addValue("slave_host_name", slaveHost)
+ .addValue("slave_host_uuid", slaveHostId)
.addValue("slave_volume_name", slaveVolumeName));
}
diff --git
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/gluster/GlusterGeoRepDaoTest.java
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/gluster/GlusterGeoRepDaoTest.java
index 5d0c6eb..f28aaba 100644
---
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/gluster/GlusterGeoRepDaoTest.java
+++
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/gluster/GlusterGeoRepDaoTest.java
@@ -165,7 +165,7 @@
@Test
public void testGetBySlaveHostAndVolume() {
GlusterGeoRepSession session =
dao.getGeoRepSession(FixturesTool.GLUSTER_VOLUME_UUID1,
- "192.168.122.17", "slave-replica");
+ new Guid("44f645f6-3fe9-4b35-a30c-be0d1a835ea8"),
"slave-replica");
assertNotNull(session);
assertEquals(FixturesTool.GLUSTER_GEOREP_SESSION_ID, session.getId());
}
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/GlusterVolumeGeoRepCreateModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/GlusterVolumeGeoRepCreateModel.java
index 9d9a6f3..e261e80 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/GlusterVolumeGeoRepCreateModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/GlusterVolumeGeoRepCreateModel.java
@@ -14,6 +14,8 @@
import org.ovirt.engine.core.common.queries.SearchParameters;
import org.ovirt.engine.core.common.queries.VdcQueryReturnValue;
import org.ovirt.engine.core.common.queries.VdcQueryType;
+import org.ovirt.engine.core.common.utils.Pair;
+import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.ui.frontend.AsyncQuery;
import org.ovirt.engine.ui.frontend.Frontend;
import org.ovirt.engine.ui.frontend.INewAsyncCallback;
@@ -40,7 +42,7 @@
private EntityModel<String> slaveUserName;
private ListModel<GlusterVolumeEntity> slaveVolumes;
private ListModel<String> slaveClusters;
- private ListModel<String> slaveHosts;
+ private ListModel<Pair<String, Guid>> slaveHosts;
private EntityModel<Boolean> startSession;
private String queryFailureMessage;
private Collection<GlusterVolumeEntity> volumeList = new
ArrayList<GlusterVolumeEntity>();
@@ -90,7 +92,7 @@
@Override
public void eventRaised(Event ev, Object sender, EventArgs args) {
GlusterVolumeEntity selectedSlaveVolume =
getSlaveVolumes().getSelectedItem();
- Set<String> hostsInCurrentVolume = new HashSet<String>();
+ Set<Pair<String, Guid>> hostsInCurrentVolume = new
HashSet<Pair<String, Guid>>();
if (!getShowEligibleVolumes().getEntity() &&
selectedSlaveVolume != null) {
updateRecommendatonViolations();
}
@@ -171,10 +173,10 @@
return volumesInCurrentCluster;
}
- public Set<String> getHostNamesForVolume(GlusterVolumeEntity volume) {
- Set<String> hosts = new HashSet<String>();
+ public Set<Pair<String, Guid>> getHostNamesForVolume(GlusterVolumeEntity
volume) {
+ Set<Pair<String, Guid>> hosts = new HashSet<Pair<String, Guid>>();
for(GlusterBrickEntity currentBrick : volume.getBricks()) {
- hosts.add(currentBrick.getServerName());
+ hosts.add(new Pair<String, Guid>(currentBrick.getServerName(),
currentBrick.getServerId()));
}
return hosts;
}
@@ -187,11 +189,11 @@
this.slaveClusters = slaveClusters;
}
- public ListModel<String> getSlaveHosts() {
+ public ListModel<Pair<String, Guid>> getSlaveHosts() {
return slaveHosts;
}
- public void setSlaveHosts(ListModel<String> slaveHosts) {
+ public void setSlaveHosts(ListModel<Pair<String, Guid>> slaveHosts) {
this.slaveHosts = slaveHosts;
}
@@ -212,7 +214,7 @@
setShowEligibleVolumes(new EntityModel<Boolean>());
setSlaveClusters(new ListModel<String>());
setSlaveVolumes(new ListModel<GlusterVolumeEntity>());
- setSlaveHosts(new ListModel<String>());
+ setSlaveHosts(new ListModel<Pair<String, Guid>>());
setStartSession(new EntityModel<Boolean>());
setSlaveUserName(new EntityModel<String>(constants.emptyString()));
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeGeoRepListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeGeoRepListModel.java
index 90397c6..ba6d2ff 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeGeoRepListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeGeoRepListModel.java
@@ -379,13 +379,14 @@
createModel.startProgress(null);
final Guid masterVolumeId = getEntity().getId();
final String remoteVolumeName =
createModel.getSlaveVolumes().getSelectedItem().getName();
- final String remoteHostName =
createModel.getSlaveHosts().getSelectedItem();
+ final String remoteHostName =
createModel.getSlaveHosts().getSelectedItem().getFirst();
String remoteUserName = createModel.getSlaveUserName().getEntity();
String remoteUserGroup =
createModel.getSlaveUserGroupName().getEntity();
+ final Guid remoteHostId =
createModel.getSlaveHosts().getSelectedItem().getSecond();
Frontend.getInstance().runAction(VdcActionType.CreateGlusterVolumeGeoRepSession,
new GlusterVolumeGeoRepSessionParameters(masterVolumeId,
remoteVolumeName,
- remoteHostName,
+ remoteHostId ,
remoteUserName,
remoteUserGroup,
!createModel.getShowEligibleVolumes().getEntity()),
@@ -402,7 +403,7 @@
Frontend.getInstance().runAction(VdcActionType.StartGlusterVolumeGeoRep,
new
GlusterVolumeGeoRepSessionParameters(masterVolumeId,
remoteVolumeName,
- remoteHostName),
+ remoteHostId),
new IFrontendActionAsyncCallback() {
@Override
public void
executed(FrontendActionAsyncResult result) {
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/GlusterVolumeGeoRepCreateSessionPopupView.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/GlusterVolumeGeoRepCreateSessionPopupView.java
index da85511..778bda4 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/GlusterVolumeGeoRepCreateSessionPopupView.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/GlusterVolumeGeoRepCreateSessionPopupView.java
@@ -1,6 +1,8 @@
package org.ovirt.engine.ui.webadmin.section.main.view.popup.gluster;
import
org.ovirt.engine.core.common.businessentities.gluster.GlusterVolumeEntity;
+import org.ovirt.engine.core.common.utils.Pair;
+import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.ui.common.CommonApplicationTemplates;
import org.ovirt.engine.ui.common.idhandler.ElementIdHandler;
import org.ovirt.engine.ui.common.idhandler.WithElementId;
@@ -54,7 +56,7 @@
@UiField(provided = true)
@Path(value = "slaveHosts.selectedItem")
@WithElementId
- ListModelTypeAheadListBoxEditor<String> slaveHostIpEditor;
+ ListModelTypeAheadListBoxEditor<Pair<String, Guid>> slaveHostIpEditor;
@UiField(provided = true)
@Path(value = "slaveVolumes.selectedItem")
@@ -130,16 +132,16 @@
}
});
- slaveHostIpEditor = new ListModelTypeAheadListBoxEditor<String>(new
ListModelTypeAheadListBoxEditor.NullSafeSuggestBoxRenderer<String>() {
+ slaveHostIpEditor = new ListModelTypeAheadListBoxEditor<Pair<String,
Guid>>(new
ListModelTypeAheadListBoxEditor.NullSafeSuggestBoxRenderer<Pair<String,
Guid>>() {
@Override
- public String getReplacementStringNullSafe(String data) {
- return data;
+ public String getReplacementStringNullSafe(Pair<String, Guid>
data) {
+ return data.getFirst();
}
@Override
- public String getDisplayStringNullSafe(String data) {
- return templates.typeAheadNameDescription(data == null ?
constants.empty() : data, constants.empty()).asString();
+ public String getDisplayStringNullSafe(Pair<String, Guid> data) {
+ return templates.typeAheadNameDescription(data == null ?
constants.empty() : data.getFirst(), constants.empty()).asString();
}
});
diff --git a/packaging/dbscripts/gluster_georep_sp.sql
b/packaging/dbscripts/gluster_georep_sp.sql
index 592c125..813217d 100644
--- a/packaging/dbscripts/gluster_georep_sp.sql
+++ b/packaging/dbscripts/gluster_georep_sp.sql
@@ -146,7 +146,7 @@
LANGUAGE plpgsql;
Create or replace FUNCTION
GetGlusterGeoRepSessionBySlaveHostAndVolume(v_master_volume_id UUID,
-
v_slave_host_name VARCHAR(150),
+
v_slave_host_uuid UUID,
v_slave_volume_name VARCHAR(150))
RETURNS SETOF gluster_georep_sessions_view STABLE
AS $procedure$
@@ -154,7 +154,7 @@
RETURN QUERY SELECT *
FROM gluster_georep_sessions_view
WHERE master_volume_id = v_master_volume_id
- AND slave_host_name = v_slave_host_name
+ AND slave_host_uuid = v_slave_host_uuid
AND slave_volume_name = v_slave_volume_name;
END; $procedure$
LANGUAGE plpgsql;
--
To view, visit https://gerrit.ovirt.org/40417
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4440eddbc2616c7ca89feaae3ba0e67d93562213
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.5-gluster
Gerrit-Owner: anmolbabu <anb...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
