anmolbabu has uploaded a new change for review. Change subject: engine : VDS Command to start geo-rep session ......................................................................
engine : VDS Command to start geo-rep session VDS Command to start geo-rep session Change-Id: Ifb18e64dfcf66d61361f958ded9824213e9847a0 Signed-off-by: Anmol Babu <[email protected]> --- 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/GlusterVolumeGeoRepSessionStartVDSParameters.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/GlusterVolumeGeoRepStartVDSCommand.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, 95 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/36/32536/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..6eb2adc 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 @@ -378,6 +378,8 @@ REMOVE_GLUSTER_VOLUME_BRICKS_NOT_FOUND_FROM_CLI(4092, AuditLogSeverity.WARNING), GLUSTER_VOLUME_DETAILS_REFRESH(4093), GLUSTER_VOLUME_DETAILS_REFRESH_FAILED(4094, AuditLogSeverity.ERROR), + GLUSTER_VOLUME_GEO_REP_START_FAILED_EXCEPTION(4595, AuditLogSeverity.ERROR), + GLUSTER_VOLUME_GEO_REP_START(4596), USER_FORCE_SELECTED_SPM_STOP_FAILED(4096, AuditLogSeverity.ERROR), USER_FORCE_SELECTED_SPM(159), USER_VDS_RESTART(41), 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..896982e 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), + GlusterVolumeGeoRepStart(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..95fe53b 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 @@ -401,6 +401,7 @@ GlfsStatvfsException(4571), GlfsInitException(4572), GlfsFiniException(4573), + GlusterVolumeGeoRepStartFailedException(4595), UnicodeArgumentException(4900), 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..820d607 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 @@ -88,6 +88,7 @@ VAR__ACTION__LOGON, VAR__ACTION__LOGOFF, VAR__ACTION__REBALANCE_START, + VAR_ACTION_GEO_REP_START, VAR__ACTION__REBALANCE_STOP, VAR__ACTION__REMOVE_BRICKS_START, VAR__ACTION__ASSIGN, 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..ba16782 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 @@ -134,6 +134,7 @@ StopRebalanceGlusterVolume("org.ovirt.engine.core.vdsbroker.gluster"), AddBricksToGlusterVolume("org.ovirt.engine.core.vdsbroker.gluster"), ReplaceGlusterVolumeBrick("org.ovirt.engine.core.vdsbroker.gluster"), + GlusterVolumeGeoRepStart("org.ovirt.engine.core.vdsbroker.gluster"), RemoveGlusterServer("org.ovirt.engine.core.vdsbroker.gluster"), AddGlusterServer("org.ovirt.engine.core.vdsbroker.gluster"), GlusterServersList("org.ovirt.engine.core.vdsbroker.gluster"), diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/gluster/GlusterVolumeGeoRepSessionStartVDSParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/gluster/GlusterVolumeGeoRepSessionStartVDSParameters.java new file mode 100644 index 0000000..96b3f89 --- /dev/null +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/gluster/GlusterVolumeGeoRepSessionStartVDSParameters.java @@ -0,0 +1,43 @@ +package org.ovirt.engine.core.common.vdscommands.gluster; + +import org.ovirt.engine.core.compat.Guid; + +public class GlusterVolumeGeoRepSessionStartVDSParameters extends GlusterVolumeVDSParameters { + private String slaveVolumeName; + private String slaveHost; + private boolean force; + + public GlusterVolumeGeoRepSessionStartVDSParameters() { + + } + + public GlusterVolumeGeoRepSessionStartVDSParameters(Guid serverId, String volumeName, String slaveVolumeName, String slaveHost) { + super(serverId, volumeName); + this.slaveVolumeName = slaveVolumeName; + this.slaveHost = slaveHost; + } + + public boolean isForce() { + return force; + } + + public void setForce(boolean force) { + this.force = force; + } + + public String getSlaveVolumeName() { + return slaveVolumeName; + } + + public void setSlaveVolumeName(String slaveVolumeName) { + this.slaveVolumeName = slaveVolumeName; + } + + public String getSlaveHost() { + return slaveHost; + } + + public void setSlaveHost(String slaveHost) { + this.slaveHost = slaveHost; + } +} 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..e9ad718 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 +GlusterVolumeGeoRepStartFailedException=Volume geo-replication start 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..246be08 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,6 +30,7 @@ case AddBricksToGlusterVolumeFailed: case GlusterVolumeSetOptionFailed: case GlusterVolumeRebalanceStartFailed: + case GlusterVolumeGeoRepStartFailedException: case GlusterVolumeDeleteFailed: case GlusterVolumeReplaceBrickStartFailed: case GlusterVolumeListFailed: diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterVolumeGeoRepStartVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterVolumeGeoRepStartVDSCommand.java new file mode 100644 index 0000000..342fe98 --- /dev/null +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterVolumeGeoRepStartVDSCommand.java @@ -0,0 +1,18 @@ +package org.ovirt.engine.core.vdsbroker.gluster; + +import org.ovirt.engine.core.common.vdscommands.gluster.GlusterVolumeGeoRepSessionStartVDSParameters; + +public class GlusterVolumeGeoRepStartVDSCommand<P extends GlusterVolumeGeoRepSessionStartVDSParameters> extends AbstractGlusterBrokerCommand<P> { + + public GlusterVolumeGeoRepStartVDSCommand(P parameters) { + super(parameters); + } + + @Override + protected void executeVdsBrokerCommand() { + GlusterVolumeGeoRepSessionStartVDSParameters parameters = getParameters(); + status = getBroker().glusterVolumeGeoRepStart(parameters.getVolumeName(), parameters.getSlaveHost(), 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..802e5fac 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 @@ -1201,6 +1201,16 @@ } @Override + public StatusOnlyReturnForXmlRpc glusterVolumeGeoRepStart(String masterVolumeName, String slaveHost, String slaveVolumeName, Boolean force) { + JsonRpcRequest request = new RequestBuilder("GlusterVolume.geoRepStart").withParameter("volumeName", masterVolumeName) + .withParameter("remoteHost", slaveHost) + .withParameter("remoteVolumeName", slaveVolumeName) + .withParameter("force", force).build(); + Map<String, Object> response = new FutureMap(this.client, request); + return new StatusOnlyReturnForXmlRpc(response); + } + + @Override public GlusterVolumeStatusReturnForXmlRpc glusterVolumeStatus(Guid clusterId, String volumeName, String brickName, 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..07cca01 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 @@ -265,6 +265,8 @@ StatusOnlyReturnForXmlRpc glusterVolumeProfileStop(String volumeName); + StatusOnlyReturnForXmlRpc glusterVolumeGeoRepStart(String masterVolumeName, String slaveHost, String slaveVolumeName, Boolean force); + GlusterVolumeStatusReturnForXmlRpc glusterVolumeStatus(Guid clusterId, String volumeName, String brickName, 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..daef8cc 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 @@ -259,6 +259,8 @@ public Map<String, Object> glusterVolumeProfileStop(String volumeName); + public Map<String, Object> glusterVolumeGeoRepStart(String masterVolumeName, String slaveHost, String slaveVolumeName, Boolean force); + public Map<String, Object> glusterVolumeStatus(String volumeName, String brickName, String volumeStatusOption); public Map<String, Object> glusterVolumeProfileInfo(String volumeName, boolean nfs); 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..15f3093 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 @@ -1190,6 +1190,15 @@ } @Override + public StatusOnlyReturnForXmlRpc glusterVolumeGeoRepStart(String masterVolumeName, String slaveHost, String slaveVolumeName, Boolean force) { + try { + return new StatusOnlyReturnForXmlRpc(vdsServer.glusterVolumeGeoRepStart(masterVolumeName, slaveHost, slaveVolumeName, force)); + } catch (UndeclaredThrowableException ute) { + throw new XmlRpcRunTimeException(ute); + } + } + + @Override public GlusterVolumeStatusReturnForXmlRpc glusterVolumeStatus(Guid clusterId, String volumeName, String brickName, String volumeStatusOption) { 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..2383565 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 @@ -732,6 +732,9 @@ @DefaultStringValue("Gluster Volume Profile Start Failed.") String GlusterVolumeProfileStartFailed(); + @DefaultStringValue("Gluster volume geo-replication start failed") + String GlusterVolumeGeoRepStartFailed(); + @DefaultStringValue("Gluster Volume Profile Stop Failed.") String GlusterVolumeProfileStopFailed(); -- To view, visit http://gerrit.ovirt.org/32536 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifb18e64dfcf66d61361f958ded9824213e9847a0 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: anmolbabu <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
