Ramesh N has uploaded a new change for review.
Change subject: gluster: VDS Cmd: Gluster Volume Rebalance Stop
......................................................................
gluster: VDS Cmd: Gluster Volume Rebalance Stop
VDS Command for Gluster Volume Rebalance Stop
Change-Id: I6a48482fb8ce06cbe8d30a942538e056c695b195
Signed-off-by: Ramesh Nachimuthu <rnach...@redhat.com>
---
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/vdscommands/VDSCommandType.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/StopRebalanceGlusterVolumeVDSCommand.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/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/VdsmErrors.properties
10 files changed, 55 insertions(+), 2 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/42/18442/1
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 61e0e02..d626caa 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
@@ -357,6 +357,7 @@
AddBricksToGlusterVolumeFailed(4128),
GlusterVolumeSetOptionFailed(4131),
GlusterVolumeRebalanceStartFailed(4135),
+ GlusterVolumeRebalanceStopFailed(4137),
GlusterVolumeDeleteFailed(4139),
GlusterVolumeReplaceBrickStartFailed(4142),
GlusterVolumeListFailed(4149),
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 1dfc973..3244be9 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
@@ -127,6 +127,7 @@
GetGlusterVolumeOptionsInfo("org.ovirt.engine.core.vdsbroker.gluster"),
GlusterVolumeRemoveBricks("org.ovirt.engine.core.vdsbroker.gluster"),
StartRebalanceGlusterVolume("org.ovirt.engine.core.vdsbroker.gluster"),
+ StopRebalanceGlusterVolume("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/dal/src/main/resources/bundles/VdsmErrors.properties
b/backend/manager/modules/dal/src/main/resources/bundles/VdsmErrors.properties
index da4b76d..527030a 100644
---
a/backend/manager/modules/dal/src/main/resources/bundles/VdsmErrors.properties
+++
b/backend/manager/modules/dal/src/main/resources/bundles/VdsmErrors.properties
@@ -332,6 +332,7 @@
AddBricksToGlusterVolumeFailed=Gluster Volume Add Brick(s) Failed.
GlusterVolumeSetOptionFailed=Gluster Volume Set Option Failed
GlusterVolumeRebalanceStartFailed=Gluster Volume Rebalance Start Failed
+GlusterVolumeRebalanceStopFailed=Gluster Volume Rebalance Stop 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 ec17a23..539cfcc 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
@@ -59,6 +59,7 @@
case GlusterServicesActionFailed:
case GlusterServiceActionNotSupported:
case GlusterVolumeTaskStatusFailed:
+ case GlusterVolumeRebalanceStopFailed:
// 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/StopRebalanceGlusterVolumeVDSCommand.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/StopRebalanceGlusterVolumeVDSCommand.java
new file mode 100644
index 0000000..c2f731d
--- /dev/null
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/StopRebalanceGlusterVolumeVDSCommand.java
@@ -0,0 +1,32 @@
+package org.ovirt.engine.core.vdsbroker.gluster;
+
+import java.util.Date;
+
+import
org.ovirt.engine.core.common.businessentities.gluster.GlusterVolumeTaskStatusEntity;
+import
org.ovirt.engine.core.common.vdscommands.gluster.GlusterVolumeVDSParameters;
+import org.ovirt.engine.core.vdsbroker.vdsbroker.StatusForXmlRpc;
+
+public class StopRebalanceGlusterVolumeVDSCommand <P extends
GlusterVolumeVDSParameters> extends AbstractGlusterBrokerCommand<P> {
+ private GlusterVolumeTaskReturnForXmlRpc result;
+
+ public StopRebalanceGlusterVolumeVDSCommand(P parameters) {
+ super(parameters);
+ }
+
+ @Override
+ protected StatusForXmlRpc getReturnStatus() {
+ return result.mStatus;
+ }
+
+ @Override
+ protected void ExecuteVdsBrokerCommand() {
+ String volumeName = getParameters().getVolumeName();
+ result = getBroker().glusterVolumeRebalanceStop(volumeName);
+ ProceedProxyReturnValue();
+
+ // Set the current engine time as status time
+ GlusterVolumeTaskStatusEntity entity = result.getStatusDetails();
+ entity.setStatusTime(new Date());
+ setReturnValue(entity);
+ }
+}
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 c03a144..7066830 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
@@ -12,8 +12,8 @@
import org.ovirt.engine.core.vdsbroker.gluster.GlusterTaskInfoReturnForXmlRpc;
import
org.ovirt.engine.core.vdsbroker.gluster.GlusterVolumeOptionsInfoReturnForXmlRpc;
import
org.ovirt.engine.core.vdsbroker.gluster.GlusterVolumeProfileInfoReturnForXmlRpc;
-import
org.ovirt.engine.core.vdsbroker.gluster.GlusterVolumeTaskReturnForXmlRpc;
import
org.ovirt.engine.core.vdsbroker.gluster.GlusterVolumeStatusReturnForXmlRpc;
+import
org.ovirt.engine.core.vdsbroker.gluster.GlusterVolumeTaskReturnForXmlRpc;
import
org.ovirt.engine.core.vdsbroker.gluster.GlusterVolumesListReturnForXmlRpc;
import org.ovirt.engine.core.vdsbroker.irsbroker.IsoListReturnForXmlRpc;
import org.ovirt.engine.core.vdsbroker.irsbroker.OneUuidReturnForXmlRpc;
@@ -214,6 +214,8 @@
GlusterTaskInfoReturnForXmlRpc glusterVolumeRebalanceStart(String
volumeName, Boolean fixLayoutOnly, Boolean force);
+ GlusterVolumeTaskReturnForXmlRpc glusterVolumeRebalanceStop(String
volumeName);
+
StatusOnlyReturnForXmlRpc glusterVolumeReplaceBrickStart(String volumeName,
String existingBrickDir,
String newBrickDir);
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 078b12b..98d6c4e 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
@@ -196,6 +196,8 @@
public Map<String, Object> glusterVolumeRebalanceStart(String volumeName,
Boolean fixLayoutOnly, Boolean force);
+ public Map<String, Object> glusterVolumeRebalanceStop(String volumeName);
+
public Map<String, Object> replaceGlusterVolumeBrickStart(String
volumeName, String existingBrickDir, String newBrickDir);
public Map<String, Object> glusterHostRemove(String hostName, Boolean
force);
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 463162d..da1f7fc 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
@@ -14,8 +14,8 @@
import org.ovirt.engine.core.vdsbroker.gluster.GlusterTaskInfoReturnForXmlRpc;
import
org.ovirt.engine.core.vdsbroker.gluster.GlusterVolumeOptionsInfoReturnForXmlRpc;
import
org.ovirt.engine.core.vdsbroker.gluster.GlusterVolumeProfileInfoReturnForXmlRpc;
-import
org.ovirt.engine.core.vdsbroker.gluster.GlusterVolumeTaskReturnForXmlRpc;
import
org.ovirt.engine.core.vdsbroker.gluster.GlusterVolumeStatusReturnForXmlRpc;
+import
org.ovirt.engine.core.vdsbroker.gluster.GlusterVolumeTaskReturnForXmlRpc;
import
org.ovirt.engine.core.vdsbroker.gluster.GlusterVolumesListReturnForXmlRpc;
import org.ovirt.engine.core.vdsbroker.irsbroker.IsoListReturnForXmlRpc;
import org.ovirt.engine.core.vdsbroker.irsbroker.OneUuidReturnForXmlRpc;
@@ -999,6 +999,15 @@
}
@Override
+ public GlusterVolumeTaskReturnForXmlRpc glusterVolumeRebalanceStop(String
volumeName){
+ try {
+ return new
GlusterVolumeTaskReturnForXmlRpc(vdsServer.glusterVolumeRebalanceStop(volumeName));
+ } catch (UndeclaredThrowableException ute) {
+ throw new XmlRpcRunTimeException(ute);
+ }
+ }
+
+ @Override
public StatusOnlyReturnForXmlRpc glusterHostRemove(String hostName,
Boolean force) {
try {
return new
StatusOnlyReturnForXmlRpc(vdsServer.glusterHostRemove(hostName, force));
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 390692d..5f6a30b 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
@@ -706,6 +706,9 @@
@DefaultStringValue("Gluster Volume Rebalance Start Failed.")
String GlusterVolumeRebalanceStartFailed();
+ @DefaultStringValue("Gluster Volume Rebalance Stop Failed.")
+ String GlusterVolumeRebalanceStopFailed();
+
@DefaultStringValue("Gluster Volume Replace Brick Start Failed.")
String GlusterVolumeReplaceBrickStartFailed();
diff --git
a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/VdsmErrors.properties
b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/VdsmErrors.properties
index 80a9a6b..fb3c1b3 100644
---
a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/VdsmErrors.properties
+++
b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/VdsmErrors.properties
@@ -348,6 +348,7 @@
GlusterVolumeRemoveBricksFailed=Gluster Volume Remove Bricks Failed.
AddBricksToGlusterVolumeFailed=Gluster Volume Add Brick Failed.
GlusterVolumeRebalanceStartFailed=Gluster Volume Rebalance Start Failed.
+GlusterVolumeRebalanceStopFailed=Gluster Volume Rebalance Stop Failed
GlusterVolumeReplaceBrickStartFailed=Gluster Volume Replace Brick Start Failed.
GlusterHostRemoveFailed=Gluster Host Remove Failed.
GlusterVolumeProfileStartFailed=Gluster Volume Profile Start Failed.
--
To view, visit http://gerrit.ovirt.org/18442
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6a48482fb8ce06cbe8d30a942538e056c695b195
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Ramesh N <rnach...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
