Sahina Bose has uploaded a new change for review.
Change subject: engine: Added username to georep session
......................................................................
engine: Added username to georep session
Geo-rep session supports non root user as well now,
hence adding the username to georep session entity
Updated the commands to use this property
Change-Id: I5015c11891600c8e44710fc45c43cfcca8da941c
Signed-off-by: Sahina Bose <sab...@redhat.com>
---
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterGeoRepSession.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/gluster/GlusterGeoRepDaoDbFacadeImpl.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterVolumeGeoRepStatusForXmlRpc.java
M packaging/dbscripts/create_views.sql
M packaging/dbscripts/gluster_georep_sp.sql
A
packaging/dbscripts/upgrade/03_05_1440_add_username_column_to_georep_session.sql
6 files changed, 24 insertions(+), 5 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/50/40450/1
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterGeoRepSession.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterGeoRepSession.java
index acdb6d4..8210058 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterGeoRepSession.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterGeoRepSession.java
@@ -20,6 +20,7 @@
private Guid sessionId;
private Guid slaveVolumeId;
private GeoRepSessionStatus status;
+ private String userName;
private ArrayList<GlusterGeoRepSessionDetails> sessionDetails;
public Guid getMasterVolumeId() {
@@ -78,6 +79,14 @@
this.slaveVolumeId = slaveVolumeId;
}
+ public String getUserName() {
+ return userName;
+ }
+
+ public void setUserName(String userName) {
+ this.userName = userName;
+ }
+
@Override
public GeoRepSessionStatus getStatus() {
return status;
@@ -122,6 +131,7 @@
result = prime * result + ((slaveNodeUuid == null) ? 0 :
slaveNodeUuid.hashCode());
result = prime * result + ((slaveVolumeId == null) ? 0 :
slaveVolumeId.hashCode());
result = prime * result + ((slaveVolumeName == null) ? 0 :
slaveVolumeName.hashCode());
+ result = prime * result + ((userName == null) ? 0 :
userName.hashCode());
result = prime * result + ((status == null) ? 0 : status.hashCode());
return result;
}
@@ -137,6 +147,7 @@
&& (ObjectUtils.objectsEqual(getSlaveNodeUuid(),
session.getSlaveNodeUuid()))
&& (ObjectUtils.objectsEqual(getSlaveVolumeId(),
session.getSlaveVolumeId()))
&& (ObjectUtils.objectsEqual(getSlaveVolumeName(),
session.getSlaveVolumeName()))
+ && (ObjectUtils.objectsEqual(getUserName(),
session.getUserName()))
&& (ObjectUtils.objectsEqual(getStatus(),
session.getStatus()))) {
return true;
}
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..85b616b 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
@@ -46,6 +46,7 @@
entity.setSlaveNodeUuid(getGuid(rs, "slave_host_uuid"));
entity.setSlaveVolumeId(getGuid(rs, "slave_volume_id"));
entity.setSlaveVolumeName(rs.getString("slave_volume_name"));
+ entity.setUserName(rs.getString("user_name"));
entity.setStatus(GeoRepSessionStatus.valueOf(rs.getString("status")));
return entity;
}
@@ -173,6 +174,7 @@
.addValue("slave_host_uuid", geoRepSession.getSlaveNodeUuid())
.addValue("slave_volume_name",
geoRepSession.getSlaveVolumeName())
.addValue("slave_volume_id", geoRepSession.getSlaveVolumeId())
+ .addValue("user_name", geoRepSession.getUserName())
.addValue("status",
EnumUtils.nameOrNull(geoRepSession.getStatus()));
}
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 8a91f14..8d9d785 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
@@ -78,6 +78,7 @@
if(slaveNode.contains("@")) {
String[] hostComponents = slaveNode.split("@");
slaveNode = hostComponents[hostComponents.length - 1];
+ geoRepSession.setUserName(hostComponents[0]);
}
String slaveVolume = (String) innerMap.get(REMOTE_VOL_NAME);
geoRepSession.setSlaveHostName(slaveNode);
diff --git a/packaging/dbscripts/create_views.sql
b/packaging/dbscripts/create_views.sql
index 28e1605..163b27f 100644
--- a/packaging/dbscripts/create_views.sql
+++ b/packaging/dbscripts/create_views.sql
@@ -1792,8 +1792,10 @@
slave_host_name, slave_volume_id, slave_volume_name, georep.status,
georep._create_date, georep._update_date,
gluster_volumes.vol_name AS master_volume_name,
- gluster_volumes.cluster_id AS cluster_id
-FROM gluster_georep_session georep
+ gluster_volumes.cluster_id AS cluster_id,
+ georep.user_name
+FROM
+ gluster_georep_session georep
INNER JOIN gluster_volumes ON gluster_volumes.id = georep.master_volume_id;
CREATE OR REPLACE VIEW gluster_geo_rep_config_view
diff --git a/packaging/dbscripts/gluster_georep_sp.sql
b/packaging/dbscripts/gluster_georep_sp.sql
index 592c125..24a4d07 100644
--- a/packaging/dbscripts/gluster_georep_sp.sql
+++ b/packaging/dbscripts/gluster_georep_sp.sql
@@ -13,14 +13,15 @@
v_slave_host_uuid UUID,
v_slave_volume_name
VARCHAR(50),
v_slave_volume_id UUID,
- v_status VARCHAR(50))
+ v_status VARCHAR(50),
+ v_user_name VARCHAR(255))
RETURNS VOID
AS $procedure$
BEGIN
INSERT INTO gluster_georep_session(session_id, master_volume_id,
session_key, slave_host_name,
- slave_host_uuid, slave_volume_name, slave_volume_id, status)
+ slave_host_uuid, slave_volume_name, slave_volume_id, status, user_name)
VALUES (v_session_id, v_master_volume_id, v_session_key, v_slave_host_name,
- v_slave_host_uuid, v_slave_volume_name, v_slave_volume_id, v_status);
+ v_slave_host_uuid, v_slave_volume_name, v_slave_volume_id, v_status,
v_user_name);
END; $procedure$
LANGUAGE plpgsql;
diff --git
a/packaging/dbscripts/upgrade/03_05_1440_add_username_column_to_georep_session.sql
b/packaging/dbscripts/upgrade/03_05_1440_add_username_column_to_georep_session.sql
new file mode 100644
index 0000000..a72baab
--- /dev/null
+++
b/packaging/dbscripts/upgrade/03_05_1440_add_username_column_to_georep_session.sql
@@ -0,0 +1,2 @@
+select fn_db_add_column('gluster_georep_session', 'user_name', 'VARCHAR(255)');
+
--
To view, visit https://gerrit.ovirt.org/40450
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5015c11891600c8e44710fc45c43cfcca8da941c
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.5-gluster
Gerrit-Owner: Sahina Bose <sab...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
