anmolbabu has uploaded a new change for review.
Change subject: engine : VdsCommand for geo-rep session pause
......................................................................
engine : VdsCommand for geo-rep session pause
VdsCommand for geo-rep session pause
Change-Id: Idf1724dffbb4023e51a73d7262596f92bacb8698
Signed-off-by: Anmol Babu <anb...@redhat.com>
---
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionType.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllErrors.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllMessages.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSCommandType.java
A
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/gluster/GlusterVolumeResumeGeoRepVDSParameters.java
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
A
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/ResumeGeoRepGlusterVolumeVDSCommand.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
14 files changed, 96 insertions(+), 0 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/33/32933/1
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java
index 7eeaeb4..8a890dd 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java
@@ -298,6 +298,8 @@
GLUSTER_VOLUME_REBALANCE_START_FAILED(4013, AuditLogSeverity.ERROR),
GLUSTER_VOLUME_REMOVE_BRICKS(4014),
GLUSTER_VOLUME_REMOVE_BRICKS_FAILED(4015, AuditLogSeverity.ERROR),
+ GLUSTER_VOLUME_GEO_REP_RESUME_FAILED(4597, AuditLogSeverity.ERROR),
+ GLUSTER_VOLUME_GEO_REP_RESUME(4596),
GLUSTER_VOLUME_REPLACE_BRICK_FAILED(4016, AuditLogSeverity.ERROR),
GLUSTER_VOLUME_REPLACE_BRICK_START(4017),
GLUSTER_VOLUME_REPLACE_BRICK_START_FAILED(4018, AuditLogSeverity.ERROR),
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionType.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionType.java
index 1ae59bd..0e3a318 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionType.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionType.java
@@ -300,6 +300,7 @@
StopRemoveGlusterVolumeBricks(1423, ActionGroup.MANIPULATE_GLUSTER_VOLUME,
false, QuotaDependency.NONE),
CommitRemoveGlusterVolumeBricks(1424,
ActionGroup.MANIPULATE_GLUSTER_VOLUME, false, QuotaDependency.NONE),
RefreshGlusterVolumeDetails(1425, ActionGroup.MANIPULATE_GLUSTER_VOLUME,
QuotaDependency.NONE),
+ ResumeGeoRepGlusterVolume(1426, ActionGroup.MANIPULATE_GLUSTER_VOLUME,
QuotaDependency.NONE),
// Cluster Policy
AddClusterPolicy(1450, ActionGroup.EDIT_STORAGE_POOL_CONFIGURATION, false,
QuotaDependency.NONE),
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 4c7629d..e83f557 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
@@ -373,6 +373,7 @@
GlusterVolumeResetOptionsFailed(4155),
GlusterVolumeRemoveBricksFailed(4156),
GlusterVolumeRemoveBricksStartFailed(4140),
+ GlusterVolumeGeoRepResumeFailed(4597),
GlusterVolumeStatusFailed(4157),
GlusterVolumeProfileStartFailed(4158),
GlusterVolumeProfileStopFailed(4159),
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllMessages.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllMessages.java
index fac5612..cca70ef 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllMessages.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllMessages.java
@@ -89,6 +89,7 @@
VAR__ACTION__LOGOFF,
VAR__ACTION__REBALANCE_START,
VAR__ACTION__REBALANCE_STOP,
+ VAR_ACTION_GEO_REP_RESUME,
VAR__ACTION__REMOVE_BRICKS_START,
VAR__ACTION__ASSIGN,
VAR__ACTION__START_PROFILE,
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSCommandType.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSCommandType.java
index 6a055cc..cec809f 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSCommandType.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSCommandType.java
@@ -132,6 +132,7 @@
CommitRemoveGlusterVolumeBricks("org.ovirt.engine.core.vdsbroker.gluster"),
StartRebalanceGlusterVolume("org.ovirt.engine.core.vdsbroker.gluster"),
StopRebalanceGlusterVolume("org.ovirt.engine.core.vdsbroker.gluster"),
+ ResumeGeoRepGlusterVolume("org.ovirt.engine.core.vdsbroker.gluster"),
AddBricksToGlusterVolume("org.ovirt.engine.core.vdsbroker.gluster"),
ReplaceGlusterVolumeBrick("org.ovirt.engine.core.vdsbroker.gluster"),
RemoveGlusterServer("org.ovirt.engine.core.vdsbroker.gluster"),
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/gluster/GlusterVolumeResumeGeoRepVDSParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/gluster/GlusterVolumeResumeGeoRepVDSParameters.java
new file mode 100644
index 0000000..cac92bb
--- /dev/null
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/gluster/GlusterVolumeResumeGeoRepVDSParameters.java
@@ -0,0 +1,45 @@
+package org.ovirt.engine.core.common.vdscommands.gluster;
+
+import org.ovirt.engine.core.compat.Guid;
+
+public class GlusterVolumeResumeGeoRepVDSParameters extends
GlusterVolumeVDSParameters {
+
+ private String slaveHostName;
+ private String slaveVolumeName;
+ private boolean force;
+
+ public GlusterVolumeResumeGeoRepVDSParameters() {
+
+ }
+
+ public GlusterVolumeResumeGeoRepVDSParameters(Guid serverId, String
volumeName, String slaveHostName, String slaveVolumeName, boolean force) {
+ super(serverId, volumeName);
+ this.slaveHostName = slaveHostName;
+ this.slaveVolumeName = slaveVolumeName;
+ this.force = force;
+ }
+
+ public String getSlaveHostName() {
+ return slaveHostName;
+ }
+
+ public void setSlaveHostName(String slaveHostName) {
+ this.slaveHostName = slaveHostName;
+ }
+
+ public String getSlaveVolumeName() {
+ return slaveVolumeName;
+ }
+
+ public void setSlaveVolumeName(String slaveVolumeName) {
+ this.slaveVolumeName = slaveVolumeName;
+ }
+
+ public boolean isForce() {
+ return force;
+ }
+
+ public void setForce(boolean force) {
+ this.force = force;
+ }
+}
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 e2d4509..b852133 100644
---
a/backend/manager/modules/dal/src/main/resources/bundles/VdsmErrors.properties
+++
b/backend/manager/modules/dal/src/main/resources/bundles/VdsmErrors.properties
@@ -336,6 +336,7 @@
GlusterVolumeSetOptionFailed=Gluster Volume Set Option Failed
GlusterVolumeRebalanceStartFailed=Gluster Volume Rebalance Start Failed
GlusterVolumeRebalanceStopFailed=Gluster Volume Rebalance Stop Failed
+GlusterVolumeGeoRepResumeFailed=Volume Geo-Replication Resume Failed
GlusterVolumeDeleteFailed=Gluster Volume Delete Failed
GlusterVolumeReplaceBrickStartFailed=Gluster Volume Replace Brick Start Failed
GlusterVolumeListFailed=Failed to fetch Gluster Volume List
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 2b2d573..008a034 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
@@ -62,6 +62,7 @@
case GlusterVolumeRebalanceStopFailed:
case GlusterVolumeStatusAllFailedException:
case GlusterVolumeRebalanceStatusFailedException:
+ case GlusterVolumeGeoRepResumeFailed:
case GlusterVolumeRemoveBricksStartFailed:
case GlusterVolumeRemoveBricksStopFailed:
case GlusterVolumeRemoveBrickStatusFailed:
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/ResumeGeoRepGlusterVolumeVDSCommand.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/ResumeGeoRepGlusterVolumeVDSCommand.java
new file mode 100644
index 0000000..a27eaf9
--- /dev/null
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/ResumeGeoRepGlusterVolumeVDSCommand.java
@@ -0,0 +1,17 @@
+package org.ovirt.engine.core.vdsbroker.gluster;
+
+import
org.ovirt.engine.core.common.vdscommands.gluster.GlusterVolumeResumeGeoRepVDSParameters;
+
+public class ResumeGeoRepGlusterVolumeVDSCommand<P extends
GlusterVolumeResumeGeoRepVDSParameters> extends AbstractGlusterBrokerCommand<P>
{
+
+ public ResumeGeoRepGlusterVolumeVDSCommand(P parameters) {
+ super(parameters);
+ }
+
+ @Override
+ protected void executeVdsBrokerCommand() {
+ GlusterVolumeResumeGeoRepVDSParameters parameters = getParameters();
+ status =
getBroker().resumeGeoRepGlusterVolume(parameters.getVolumeName(),
parameters.getSlaveHostName(), parameters.getSlaveVolumeName(),
parameters.isForce());
+ 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 bbba12b..cb7c79f 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
@@ -1114,6 +1114,16 @@
}
@Override
+ public StatusOnlyReturnForXmlRpc resumeGeoRepGlusterVolume(String
volumeName, String slaveHostName, String slaveVolumeName, boolean force) {
+ JsonRpcRequest request = new
RequestBuilder("GlusterVolume.geoRepResume").withParameter("volumeName",
volumeName)
+ .withParameter("remoteHost", slaveHostName)
+ .withParameter("remoteVolumeName", slaveVolumeName)
+ .withParameter("force", force).build();
+ Map<String, Object> response = new FutureMap(this.client, request);
+ return new StatusOnlyReturnForXmlRpc(response);
+ }
+
+ @Override
public GlusterVolumeTaskReturnForXmlRpc glusterVolumeRebalanceStop(String
volumeName) {
JsonRpcRequest request =
new
RequestBuilder("GlusterVolume.rebalanceStop").withParameter("volumeName",
volumeName).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 ff27a06..4aba830 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
@@ -305,4 +305,6 @@
StatusOnlyReturnForXmlRpc setNumberOfCpus(String vmId, String
numberOfCpus);
StatusOnlyReturnForXmlRpc updateVmPolicy(Map info);
+
+ StatusOnlyReturnForXmlRpc resumeGeoRepGlusterVolume(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 c937834..397b142 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,6 +232,8 @@
public Map<String, Object> glusterVolumeRebalanceStart(String volumeName,
Boolean fixLayoutOnly, Boolean force);
+ public Map<String, Object> resumeGeoRepGlusterVolume(String volumeName,
String slaveHostName, String slaveVolumeName, boolean force);
+
public Map<String, Object> glusterVolumeRebalanceStop(String volumeName);
public Map<String, Object> replaceGlusterVolumeBrickStart(String
volumeName, String existingBrickDir, String newBrickDir);
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 82e28e0..d2f8275 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
@@ -1093,6 +1093,15 @@
}
}
+ public StatusOnlyReturnForXmlRpc resumeGeoRepGlusterVolume(String
volumeName, String slaveHostName, String slaveVolumeName, boolean force) {
+ try{
+ Map<String, Object> xmlRpcReturnValue =
vdsServer.resumeGeoRepGlusterVolume(volumeName, slaveHostName, slaveVolumeName,
force);
+ StatusOnlyReturnForXmlRpc wrapper = new
StatusOnlyReturnForXmlRpc(xmlRpcReturnValue);
+ return wrapper;
+ } catch (UndeclaredThrowableException ute) {
+ throw new XmlRpcRunTimeException(ute);
+ }
+ }
@Override
public GlusterVolumeTaskReturnForXmlRpc glusterVolumeRebalanceStop(String
volumeName) {
try {
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 04cc904..127d68c 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
@@ -717,6 +717,9 @@
@DefaultStringValue("Gluster Volume Rebalance Start Failed.")
String GlusterVolumeRebalanceStartFailed();
+ @DefaultStringValue("Gluster Volume geo-replication resume failed")
+ String GlusterVolumeGeoRepResumeFailed();
+
@DefaultStringValue("Gluster Volume Rebalance Stop Failed.")
String GlusterVolumeRebalanceStopFailed();
--
To view, visit http://gerrit.ovirt.org/32933
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idf1724dffbb4023e51a73d7262596f92bacb8698
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: anmolbabu <anb...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
