Hello anmolbabu,
I'd like you to do a code review. Please visit
https://gerrit.ovirt.org/39639
to review the following change.
Change subject: engine : Refactoring in accordance with vdsm patches
......................................................................
engine : Refactoring in accordance with vdsm patches
This patch does the following :
1. The geo-rep engine patches were merged before the corresponding
patches and hence at merge time, contained the exception codes and
api names as the vdsm exposed at that time.
Now, that the vdsm patches have been merged, this patch
refactors the engine side accordingly.
2. StartGlusterVolumeGeoRepCommand was modifying the status of geo-rep
session in db on success. But, it is observed that the session on gluster
side takes a while to change state to ACTIVE untill then it stays as
INITIALISING and hence this patch removes the state change code and allows
the geo-rep sync job to detect state change.
Change-Id: I702d6c62f576cf2a49437fcf37155290d8580588
Signed-off-by: Anmol Babu <[email protected]>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/PauseGlusterVolumeGeoRepSessionCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/StartGlusterVolumeGeoRepCommand.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GeoRepSessionStatus.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllErrors.java
M
backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties
M backend/manager/modules/dal/src/main/resources/bundles/VdsmErrors.properties
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/AbstractGlusterBrokerCommand.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/PauseGlusterVolumeGeoRepSessionVDSCommand.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/ResumeGeoRepSessionVDSCommand.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/StartGlusterVolumeGeoRepVDSCommand.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/JsonRpcVdsServer.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IVdsServer.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerConnector.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerWrapper.java
M
frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/VdsmErrors.java
M
frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/LocalizedEnums.java
M
frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/LocalizedEnums.properties
17 files changed, 58 insertions(+), 47 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/39/39639/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/PauseGlusterVolumeGeoRepSessionCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/PauseGlusterVolumeGeoRepSessionCommand.java
index 832774b..f648079 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/PauseGlusterVolumeGeoRepSessionCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/PauseGlusterVolumeGeoRepSessionCommand.java
@@ -24,7 +24,6 @@
@Override
protected boolean canDoAction() {
if (!super.canDoAction()) {
-
return false;
}
if (getGeoRepSession().getStatus() == GeoRepSessionStatus.PASSIVE) {
@@ -52,7 +51,7 @@
@Override
public AuditLogType getAuditLogTypeValue() {
- if(getSucceeded()) {
+ if (getSucceeded()) {
return AuditLogType.GLUSTER_VOLUME_GEO_REP_PAUSE;
} else {
return AuditLogType.GLUSTER_VOLUME_GEO_REP_PAUSE_FAILED;
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 6d1a795..9ce8098 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
@@ -26,9 +26,9 @@
GlusterGeoRepSession session = getGeoRepSession();
VDSReturnValue returnValue =
runVdsCommand(VDSCommandType.StartGlusterVolumeGeoRep, new
GlusterVolumeGeoRepSessionVDSParameters(upServer.getId(),
getGlusterVolumeName(), session.getSlaveHostName(),
session.getSlaveVolumeName()));
setSucceeded(returnValue.getSucceeded());
- if(getSucceeded()) {
- getGeoRepSession().setStatus(GeoRepSessionStatus.ACTIVE);
- getGlusterGeoRepDao().updateSession(getGeoRepSession());
+ if (getSucceeded()) {
+ session.setStatus(GeoRepSessionStatus.INITIALIZING);
+ getGlusterGeoRepDao().updateSession(session);
} else {
handleVdsError(AuditLogType.GLUSTER_VOLUME_GEO_REP_START_FAILED_EXCEPTION,
returnValue.getVdsError().getMessage());
return;
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GeoRepSessionStatus.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GeoRepSessionStatus.java
index d8676e0..e9a0e2d 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GeoRepSessionStatus.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GeoRepSessionStatus.java
@@ -8,6 +8,7 @@
STOPPED("STOPPED"),
PARTIAL_FAULTY("PARTIAL FAULTY"),
UNKNOWN("UNKNOWN"),
+ PAUSED("PAUSED"),
FAULTY("FAULTY");
private String statusMsg;
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllErrors.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllErrors.java
index ec4e990..a60934b 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllErrors.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllErrors.java
@@ -376,7 +376,11 @@
GlusterVolumeProfileStopFailed(4159),
GlusterVolumeProfileInfoFailed(4160),
GlusterVolumeStatusAllFailedException(4161),
+ GlusterVolumeGeoRepSessionStartFailed(4201),
+ GlusterVolumeGeoRepSessionStopFailed(4202),
GlusterVolumeGeoRepStatusFailed(4203),
+ GlusterVolumeGeoRepSessionPauseFailed(4204),
+ GlusterVolumeGeoRepSessionResumeFailed(4205),
GlusterHostIsNotPartOfCluster(4403),
GlusterAddHostFailed(4404),
GlusterHostRemoveFailedException(4406),
@@ -401,10 +405,7 @@
GlfsInitException(4572),
GlfsFiniException(4573),
GlusterGeoRepSessionDeleteFailedException(4594),
- GlusterVolumeGeoRepStartFailedException(4595),
- GlusterVolumeGeoRepStopFailedException(4596),
- GlusterVolumeGeoRepPauseFailed(4597),
- GlusterVolumeGeoRepResumeFailed(4598),
+ GlusterVolumeGeoRepStatusDetailFailed(4600),
GlusterVolumeGeoRepSyncFailed(4601),
UnicodeArgumentException(4900),
diff --git
a/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties
b/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties
index 26c3a0c..1d8f2f3 100644
---
a/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties
+++
b/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties
@@ -743,8 +743,8 @@
GLUSTER_VOLUME_REBALANCE_START_DETECTED_FROM_CLI=Detected start of rebalance
on volume ${glusterVolumeName} of Cluster ${VdsGroupName} from CLI.
START_REMOVING_GLUSTER_VOLUME_BRICKS_DETECTED_FROM_CLI=Detected start of brick
removal for bricks ${brick} on volume ${glusterVolumeName} of Cluster
${VdsGroupName} from CLI.
GLUSTER_VOLUME_REBALANCE_NOT_FOUND_FROM_CLI=Could not find information for
rebalance on volume ${glusterVolumeName} of Cluster ${VdsGroupName} from CLI.
Marking it as unknown.
-GEOREP_SESSION_PAUSED=Geo-replication session on volume ${glusterVolumeName}
has been paused.
-GEOREP_SESSION_PAUSE_FAILED=Failed to pause geo-replication session on volume
${glusterVolumeName}
+GLUSTER_VOLUME_GEO_REP_PAUSE=Geo-replication session on volume
${glusterVolumeName} has been paused.
+GLUSTER_VOLUME_GEO_REP_PAUSE_FAILED=Failed to pause geo-replication session on
volume ${glusterVolumeName}
REMOVE_GLUSTER_VOLUME_BRICKS_NOT_FOUND_FROM_CLI=Could not find information for
remove brick on volume ${glusterVolumeName} of Cluster ${VdsGroupName} from
CLI. Marking it as unknown.
GLUSTER_SERVER_REMOVE=Host ${VdsName} removed from Cluster ${VdsGroupName}.
GLUSTER_SERVER_REMOVE_FAILED=Failed to remove host ${VdsName} from Cluster
${VdsGroupName}.
@@ -812,12 +812,12 @@
GLUSTER_GEOREP_SESSION_DETECTED_FROM_CLI=Detected new geo-replication session
${geoRepSessionKey} for volume ${glusterVolumeName}. Adding it to engine.
GLUSTER_GEOREP_SESSION_REFRESH=Refreshed geo-replication sessions for volume
${glusterVolumeName}.
GLUSTER_GEOREP_SESSION_REFRESH_FAILED=Failed to refresh geo-replication
sessions for volume ${glusterVolumeName}.
-GEOREP_SESSION_STOPPED=Geo-replication session on volume ${glusterVolumeName}
has been stopped.
+GEOREP_SESSION_STOP=Geo-replication session on volume ${glusterVolumeName} has
been stopped.
GEOREP_SESSION_STOP_FAILED=Failed to stop geo-replication session on volume
${glusterVolumeName}
GEOREP_SESSION_DELETED=Geo-replication session deleted on volume
${glusterVolumeName}
GEOREP_SESSION_DELETE_FAILED=Failed to delete geo-replication session on
volume ${glusterVolumeName}
-GEOREP_SESSION_STARTED=Geo-replication session on volume ${glusterVolumeName}
has been started.
-GEOREP_SESSION_START_FAILED=Failed to start geo-replication session on volume
${glusterVolumeName}
+GLUSTER_VOLUME_GEO_REP_START=Geo-replication session on volume
${glusterVolumeName} has been started.
+GLUSTER_VOLUME_GEO_REP_START_FAILED_EXCEPTION=Failed to start geo-replication
session on volume ${glusterVolumeName}
VDS_UNTRUSTED=Host ${VdsName} was set to non-operational. Host is not trusted
by the attestation service.
USER_ADDED_NETWORK_QOS=Network QoS ${QosName} was added. (User: ${UserName})
USER_FAILED_TO_ADD_NETWORK_QOS=Failed to add Network QoS ${QosName}. (User:
${UserName})
diff --git
a/backend/manager/modules/dal/src/main/resources/bundles/VdsmErrors.properties
b/backend/manager/modules/dal/src/main/resources/bundles/VdsmErrors.properties
index 1e6f28a..4c4fbd3 100644
---
a/backend/manager/modules/dal/src/main/resources/bundles/VdsmErrors.properties
+++
b/backend/manager/modules/dal/src/main/resources/bundles/VdsmErrors.properties
@@ -334,8 +334,8 @@
GlusterVolumeSetOptionFailed=Gluster Volume Set Option Failed
GlusterVolumeRebalanceStartFailed=Gluster Volume Rebalance Start Failed
GlusterVolumeRebalanceStopFailed=Gluster Volume Rebalance Stop Failed
-GlusterVolumeGeoRepStartFailedException=Failed to start geo-replication
session for volume
-GlusterVolumeGeoRepResumeFailed=Volume Geo-Replication Resume Failed
+GlusterVolumeGeoRepSessionStartFailed=Failed to start geo-replication session
for volume
+GlusterVolumeGeoRepSessionResumeFailed=Volume Geo-Replication Resume Failed
GlusterVolumeDeleteFailed=Gluster Volume Delete Failed
GlusterVolumeReplaceBrickStartFailed=Gluster Volume Replace Brick Start Failed
GlusterVolumeListFailed=Failed to fetch Gluster Volume List
@@ -348,7 +348,7 @@
GlusterVolumeRemoveBricksCommitFailed=Failed to commit removal of Bricks from
Gluster Volume
GlusterVolumeProfileStartFailed=Gluster Volume Profile Start Failed
GlusterVolumeProfileStopFailed=Gluster Volume Profile Stop Failed
-GlusterVolumeGeoRepPauseFailed=Failed to pause geo-replication session for
volume
+GlusterVolumeGeoRepSessionPauseFailed=Failed to pause geo-replication session
for volume
GlusterAddHostFailed=Gluster Server Add Failed
GlusterHostRemoveFailedException=Gluster Host Remove Failed
GlusterHostIsNotPartOfCluster=Host is not part of the cluster
@@ -377,7 +377,7 @@
GlfsInitException=Command failed while mounting gluster volume
GlfsFiniException=Command failed while unmounting gluster volume
GlusterGeoRepSessionDeleteFailedException=Failed to delete geo-replication
session
-GlusterVolumeGeoRepStopFailedException=Failed to stop geo-replication session
+GlusterVolumeGeoRepSessionStopFailed=Failed to stop geo-replication session
CANT_RECONSTRUCT_WHEN_A_DOMAIN_IN_POOL_IS_LOCKED=Can't reconstruct the Master
Domain when the Data Center contains Domains in Locked state.\nPlease wait
until the operation for these Domains ends before trying to reconstruct the
Master Domain again.
NO_IMPLEMENTATION=Not implemented
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/AbstractGlusterBrokerCommand.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/AbstractGlusterBrokerCommand.java
index a7db249..18c95fd 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/AbstractGlusterBrokerCommand.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/AbstractGlusterBrokerCommand.java
@@ -30,7 +30,7 @@
case AddBricksToGlusterVolumeFailed:
case GlusterVolumeSetOptionFailed:
case GlusterVolumeRebalanceStartFailed:
- case GlusterVolumeGeoRepStartFailedException:
+ case GlusterVolumeGeoRepSessionStartFailed:
case GlusterVolumeDeleteFailed:
case GlusterVolumeReplaceBrickStartFailed:
case GlusterVolumeListFailed:
@@ -38,7 +38,7 @@
case GlusterVolumeResetOptionsFailed:
case GlusterVolumeRemoveBricksFailed:
case GlusterVolumeProfileStartFailed:
- case GlusterVolumeGeoRepPauseFailed:
+ case GlusterVolumeGeoRepSessionPauseFailed:
case GlusterVolumeProfileStopFailed:
case GlusterAddHostFailed:
case GlusterHostRemoveFailedException:
@@ -64,7 +64,7 @@
case GlusterVolumeRebalanceStopFailed:
case GlusterVolumeStatusAllFailedException:
case GlusterVolumeRebalanceStatusFailedException:
- case GlusterVolumeGeoRepResumeFailed:
+ case GlusterVolumeGeoRepSessionResumeFailed:
case GlusterVolumeRemoveBricksStartFailed:
case GlusterVolumeRemoveBricksStopFailed:
case GlusterVolumeRemoveBrickStatusFailed:
@@ -75,7 +75,7 @@
case GlfsInitException:
case GlfsFiniException:
case GlusterGeoRepSessionDeleteFailedException:
- case GlusterVolumeGeoRepStopFailedException:
+ case GlusterVolumeGeoRepSessionStopFailed:
// Capture error from gluster command and record failure
getVDSReturnValue().setVdsError(new VDSError(returnStatus,
getReturnStatus().mMessage));
getVDSReturnValue().setSucceeded(false);
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/PauseGlusterVolumeGeoRepSessionVDSCommand.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/PauseGlusterVolumeGeoRepSessionVDSCommand.java
index 600735a..e5cb03e 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/PauseGlusterVolumeGeoRepSessionVDSCommand.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/PauseGlusterVolumeGeoRepSessionVDSCommand.java
@@ -11,7 +11,7 @@
@Override
protected void executeVdsBrokerCommand() {
GlusterVolumeGeoRepSessionVDSParameters parameters = getParameters();
- status =
getBroker().glusterVolumeGeoRepPause(parameters.getVolumeName(),
parameters.getSlaveHost(), parameters.getSlaveVolume(), parameters.getForce());
+ status =
getBroker().glusterVolumeGeoRepSessionPause(parameters.getVolumeName(),
parameters.getSlaveHost(), parameters.getSlaveVolume(), parameters.getForce());
proceedProxyReturnValue();
}
}
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/ResumeGeoRepSessionVDSCommand.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/ResumeGeoRepSessionVDSCommand.java
index 34130d9..9fca86b 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/ResumeGeoRepSessionVDSCommand.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/ResumeGeoRepSessionVDSCommand.java
@@ -11,7 +11,7 @@
@Override
protected void executeVdsBrokerCommand() {
GlusterVolumeGeoRepSessionVDSParameters parameters = getParameters();
- status =
getBroker().glusterVolumeGeoRepResume(parameters.getVolumeName(),
parameters.getSlaveHost(), parameters.getSlaveVolume(), parameters.getForce());
+ status =
getBroker().glusterVolumeGeoRepSessionResume(parameters.getVolumeName(),
parameters.getSlaveHost(), parameters.getSlaveVolume(), parameters.getForce());
proceedProxyReturnValue();
}
}
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/StartGlusterVolumeGeoRepVDSCommand.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/StartGlusterVolumeGeoRepVDSCommand.java
index bf44ea8..bdec25b 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/StartGlusterVolumeGeoRepVDSCommand.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/StartGlusterVolumeGeoRepVDSCommand.java
@@ -11,7 +11,7 @@
@Override
protected void executeVdsBrokerCommand() {
GlusterVolumeGeoRepSessionVDSParameters parameters = getParameters();
- status =
getBroker().glusterVolumeGeoRepStart(parameters.getVolumeName(),
parameters.getSlaveHost(), parameters.getSlaveVolume(), parameters.getForce());
+ status =
getBroker().glusterVolumeGeoRepSessionStart(parameters.getVolumeName(),
parameters.getSlaveHost(), parameters.getSlaveVolume(), parameters.getForce());
proceedProxyReturnValue();
}
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/JsonRpcVdsServer.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/JsonRpcVdsServer.java
index c84df99..1788cde 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/JsonRpcVdsServer.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/JsonRpcVdsServer.java
@@ -1175,8 +1175,8 @@
}
@Override
- public StatusOnlyReturnForXmlRpc glusterVolumeGeoRepResume(String
volumeName, String slaveHostName, String slaveVolumeName, boolean force) {
- JsonRpcRequest request = new
RequestBuilder("GlusterVolume.geoRepResume").withParameter("volumeName",
volumeName)
+ public StatusOnlyReturnForXmlRpc glusterVolumeGeoRepSessionResume(String
volumeName, String slaveHostName, String slaveVolumeName, boolean force) {
+ JsonRpcRequest request = new
RequestBuilder("GlusterVolume.geoRepSessionResume").withParameter("volumeName",
volumeName)
.withParameter("remoteHost", slaveHostName)
.withParameter("remoteVolumeName", slaveVolumeName)
.withParameter("force", force).build();
@@ -1295,8 +1295,8 @@
}
@Override
- public StatusOnlyReturnForXmlRpc glusterVolumeGeoRepPause(String
masterVolumeName, String slaveHost, String slaveVolumeName, boolean force) {
- JsonRpcRequest request = new
RequestBuilder("GlusterVolume.geoRepPause").withParameter("volumeName",
masterVolumeName)
+ public StatusOnlyReturnForXmlRpc glusterVolumeGeoRepSessionPause(String
masterVolumeName, String slaveHost, String slaveVolumeName, boolean force) {
+ JsonRpcRequest request = new
RequestBuilder("GlusterVolume.geoRepSessionPause").withParameter("volumeName",
masterVolumeName)
.withParameter("remoteHost", slaveHost)
.withParameter("remoteVolumeName", slaveVolumeName)
.withParameter("force", force).build();
@@ -1305,8 +1305,8 @@
}
@Override
- public StatusOnlyReturnForXmlRpc glusterVolumeGeoRepStart(String
volumeName, String remoteHost, String remoteVolumeName, Boolean force) {
- JsonRpcRequest request = new
RequestBuilder("GlusterVolume.geoRepStart").withParameter("volumeName",
volumeName)
+ public StatusOnlyReturnForXmlRpc glusterVolumeGeoRepSessionStart(String
volumeName, String remoteHost, String remoteVolumeName, Boolean force) {
+ JsonRpcRequest request = new
RequestBuilder("GlusterVolume.geoRepSessionStart").withParameter("volumeName",
volumeName)
.withParameter("remoteHost", remoteHost)
.withParameter("remoteVolumeName", remoteVolumeName)
.withParameter("force", force).build();
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IVdsServer.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IVdsServer.java
index 1384564..c48efc9 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IVdsServer.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IVdsServer.java
@@ -277,8 +277,9 @@
StatusOnlyReturnForXmlRpc glusterVolumeProfileStop(String volumeName);
- StatusOnlyReturnForXmlRpc glusterVolumeGeoRepStart(String volumeName,
String remoteHost, String remoteVolumeName, Boolean force);
- StatusOnlyReturnForXmlRpc glusterVolumeGeoRepPause(String
masterVolumeName, String slaveHost, String slaveVolumeName, boolean force);
+ StatusOnlyReturnForXmlRpc glusterVolumeGeoRepSessionStart(String
volumeName, String remoteHost, String remoteVolumeName, Boolean force);
+
+ StatusOnlyReturnForXmlRpc glusterVolumeGeoRepSessionPause(String
masterVolumeName, String slaveHost, String slaveVolumeName, boolean force);
GlusterVolumeStatusReturnForXmlRpc glusterVolumeStatus(Guid clusterId,
String volumeName,
@@ -333,5 +334,5 @@
StatusOnlyReturnForXmlRpc updateVmPolicy(Map info);
- StatusOnlyReturnForXmlRpc glusterVolumeGeoRepResume(String volumeName,
String slaveHostName, String slaveVolumeName, boolean force);
+ StatusOnlyReturnForXmlRpc glusterVolumeGeoRepSessionResume(String
volumeName, String slaveHostName, String slaveVolumeName, boolean force);
}
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerConnector.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerConnector.java
index 1f01276..b4dec87 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerConnector.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerConnector.java
@@ -232,7 +232,7 @@
public Map<String, Object> glusterVolumeRebalanceStart(String volumeName,
Boolean fixLayoutOnly, Boolean force);
- public Map<String, Object> glusterVolumeGeoRepResume(String volumeName,
String slaveHostName, String slaveVolumeName, boolean force);
+ public Map<String, Object> glusterVolumeGeoRepSessionResume(String
volumeName, String slaveHostName, String slaveVolumeName, boolean force);
public Map<String, Object> glusterVolumeRebalanceStop(String volumeName);
@@ -265,9 +265,9 @@
public Map<String, Object> glusterVolumeProfileStop(String volumeName);
- public Map<String, Object> glusterVolumeGeoRepStart(String volumeName,
String remoteHost, String remoteVolumeName, Boolean force);
+ public Map<String, Object> glusterVolumeGeoRepSessionStart(String
volumeName, String remoteHost, String remoteVolumeName, Boolean force);
- public Map<String, Object> glusterVolumeGeoRepPause(String
masterVolumeName, String slaveHost, String slaveVolumeName, boolean force);
+ public Map<String, Object> glusterVolumeGeoRepSessionPause(String
masterVolumeName, String slaveHost, String slaveVolumeName, boolean force);
public Map<String, Object> glusterVolumeStatus(String volumeName, String
brickName, String volumeStatusOption);
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerWrapper.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerWrapper.java
index 5a13b97..eac7a3b 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerWrapper.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerWrapper.java
@@ -1103,9 +1103,9 @@
}
@Override
- public StatusOnlyReturnForXmlRpc glusterVolumeGeoRepResume(String
volumeName, String slaveHostName, String slaveVolumeName, boolean force) {
+ public StatusOnlyReturnForXmlRpc glusterVolumeGeoRepSessionResume(String
volumeName, String slaveHostName, String slaveVolumeName, boolean force) {
try{
- Map<String, Object> xmlRpcReturnValue =
vdsServer.glusterVolumeGeoRepResume(volumeName, slaveHostName, slaveVolumeName,
force);
+ Map<String, Object> xmlRpcReturnValue =
vdsServer.glusterVolumeGeoRepSessionResume(volumeName, slaveHostName,
slaveVolumeName, force);
StatusOnlyReturnForXmlRpc wrapper = new
StatusOnlyReturnForXmlRpc(xmlRpcReturnValue);
return wrapper;
} catch (UndeclaredThrowableException ute) {
@@ -1209,18 +1209,18 @@
}
@Override
- public StatusOnlyReturnForXmlRpc glusterVolumeGeoRepPause(String
masterVolumeName, String slaveHost, String slaveVolumeName, boolean force) {
+ public StatusOnlyReturnForXmlRpc glusterVolumeGeoRepSessionPause(String
masterVolumeName, String slaveHost, String slaveVolumeName, boolean force) {
try {
- return new
StatusOnlyReturnForXmlRpc(vdsServer.glusterVolumeGeoRepPause(masterVolumeName,
slaveHost, slaveVolumeName, force));
+ return new
StatusOnlyReturnForXmlRpc(vdsServer.glusterVolumeGeoRepSessionPause(masterVolumeName,
slaveHost, slaveVolumeName, force));
} catch (UndeclaredThrowableException ute) {
throw new XmlRpcRunTimeException(ute);
}
}
@Override
- public StatusOnlyReturnForXmlRpc glusterVolumeGeoRepStart(String
volumeName, String remoteHost, String remoteVolumeName, Boolean force) {
+ public StatusOnlyReturnForXmlRpc glusterVolumeGeoRepSessionStart(String
volumeName, String remoteHost, String remoteVolumeName, Boolean force) {
try {
- return new
StatusOnlyReturnForXmlRpc(vdsServer.glusterVolumeGeoRepStart(volumeName,
remoteHost, remoteVolumeName, force));
+ return new
StatusOnlyReturnForXmlRpc(vdsServer.glusterVolumeGeoRepSessionStart(volumeName,
remoteHost, remoteVolumeName, force));
} catch (UndeclaredThrowableException ute) {
throw new XmlRpcRunTimeException(ute);
}
diff --git
a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/VdsmErrors.java
b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/VdsmErrors.java
index 790957e..67713c4 100644
---
a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/VdsmErrors.java
+++
b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/VdsmErrors.java
@@ -722,7 +722,7 @@
String GlusterVolumeRebalanceStartFailed();
@DefaultStringValue("Resume of geo-replication session failed on gluster
volume")
- String GlusterVolumeGeoRepResumeFailed();
+ String GlusterVolumeGeoRepSessionResumeFailed();
@DefaultStringValue("Gluster Volume Rebalance Stop Failed.")
String GlusterVolumeRebalanceStopFailed();
@@ -740,13 +740,13 @@
String GlusterVolumeProfileStartFailed();
@DefaultStringValue("Gluster volume geo-replication start failed")
- String GlusterVolumeGeoRepStartFailed();
+ String GlusterVolumeGeoRepSessionStartFailed();
@DefaultStringValue("Gluster Volume Profile Stop Failed.")
String GlusterVolumeProfileStopFailed();
@DefaultStringValue("Failed to pause the geo-replication session.")
- String GlusterVolumeGeoRepPauseFailed();
+ String GlusterVolumeGeoRepSessionPauseFailed();
String ACTIVATE_NIC_FAILED();
@@ -831,7 +831,7 @@
String GlusterGeoRepSessionDeleteFailedException();
@DefaultStringValue("Failed to stop geo-replication session")
- String GlusterVolumeGeoRepStopFailedException();
+ String GlusterVolumeGeoRepSessionStopFailed();
@DefaultStringValue("Reverting back to last known saved configuration.")
String SETUP_NETWORKS_ROLLBACK();
diff --git
a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/LocalizedEnums.java
b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/LocalizedEnums.java
index cbb4f97..9320ea1 100644
---
a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/LocalizedEnums.java
+++
b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/LocalizedEnums.java
@@ -764,6 +764,12 @@
String VdcActionType___DeleteGeoRepSession();
+ String VdcActionType___StartGlusterVolumeGeoRep();
+
+ String VdcActionType___PauseGlusterVolumeGeoRepSession();
+
+ String VdcActionType___ResumeGeoRepSession();
+
String VdcActionType___ConnectStorageToVds();
String VdcActionType___AddVnicProfile();
diff --git
a/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/LocalizedEnums.properties
b/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/LocalizedEnums.properties
index 6ec223c..9952e0b 100644
---
a/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/LocalizedEnums.properties
+++
b/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/LocalizedEnums.properties
@@ -353,6 +353,9 @@
VdcActionType___ManageGlusterService=Manage Service
VdcActionType___RefreshGeoRepSessions=Refresh Geo-replication Sessions
VdcActionType___StopGeoRepSession=Stop Geo-replication session
+VdcActionType___StartGlusterVolumeGeoRep=Start Geo-Replication Session
+VdcActionType___PauseGlusterVolumeGeoRepSession=Pause Geo-Replication Session
+VdcActionType___ResumeGeoRepSession=Resume Geo-Replication Session
VdcActionType___DeleteGeoRepSession=Delete Geo-replication session
VdcActionType___ActivateStorageDomain=Activate Storage Domain
VdcActionType___FenceVdsManualy=Fence Host Manually
--
To view, visit https://gerrit.ovirt.org/39639
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I702d6c62f576cf2a49437fcf37155290d8580588
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.5-gluster
Gerrit-Owner: Sahina Bose <[email protected]>
Gerrit-Reviewer: anmolbabu <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches
