Shubhendu Tripathi has uploaded a new change for review.
Change subject: gluster: VDS Cmd: gluster remove bricks status
......................................................................
gluster: VDS Cmd: gluster remove bricks status
VDS Command for remove bricks status
Change-Id: I21da52b06c6d48fa5e344909b7d78d044c902b4b
Signed-off-by: Shubhendu Tripathi <shtri...@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/GetGlusterVolumeRemoveBricksStatusVDSCommand.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, 60 insertions(+), 0 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/06/19106/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 92e9ced..02f5503 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
@@ -361,6 +361,7 @@
GlusterVolumeDeleteFailed(4139),
GlusterVolumeReplaceBrickStartFailed(4142),
GlusterVolumeListFailed(4149),
+ GlusterVolumeRemoveBrickStatusFailed(4152),
GlusterVolumeOptionInfoFailed(4154),
GlusterVolumeResetOptionsFailed(4155),
GlusterVolumeRemoveBricksFailed(4156),
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 982f4e4..97c6960 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
@@ -149,6 +149,7 @@
ManageGlusterService("org.ovirt.engine.core.vdsbroker.gluster"),
GetGlusterVolumeRebalanceStatus("org.ovirt.engine.core.vdsbroker.gluster"),
GetDiskAlignment("org.ovirt.engine.core.vdsbroker.vdsbroker"),
+
GetGlusterVolumeRemoveBricksStatus("org.ovirt.engine.core.vdsbroker.gluster"),
;
String packageName;
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 d23a29f..86fa226 100644
---
a/backend/manager/modules/dal/src/main/resources/bundles/VdsmErrors.properties
+++
b/backend/manager/modules/dal/src/main/resources/bundles/VdsmErrors.properties
@@ -338,6 +338,7 @@
GlusterVolumeOptionInfoFailed=Failed to fetch Gluster Volume Option Info
GlusterVolumeResetOptionsFailed=Gluster Volume Options Reset Failed
GlusterVolumeRemoveBricksFailed=Gluster Volume Remove Bricks Failed
+GlusterVolumeRemoveBrickStatusFailed=Failed to get status of gluster volume
remove bricks
GlusterVolumeProfileStartFailed=Gluster Volume Profile Start Failed
GlusterVolumeProfileStopFailed=Gluster Volume Profile Stop Failed
GlusterAddHostFailed=Gluster Server Add Failed
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 fc42a5f..46ea124 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 GlusterVolumeRebalanceStatusFailedException:
+ case GlusterVolumeRemoveBrickStatusFailed:
// 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/GetGlusterVolumeRemoveBricksStatusVDSCommand.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetGlusterVolumeRemoveBricksStatusVDSCommand.java
new file mode 100644
index 0000000..4c8c15f
--- /dev/null
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetGlusterVolumeRemoveBricksStatusVDSCommand.java
@@ -0,0 +1,37 @@
+package org.ovirt.engine.core.vdsbroker.gluster;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import
org.ovirt.engine.core.common.businessentities.gluster.GlusterBrickEntity;
+import
org.ovirt.engine.core.common.vdscommands.gluster.GlusterVolumeRemoveBricksVDSParameters;
+import org.ovirt.engine.core.vdsbroker.vdsbroker.StatusForXmlRpc;
+
+public class GetGlusterVolumeRemoveBricksStatusVDSCommand <P extends
GlusterVolumeRemoveBricksVDSParameters> extends AbstractGlusterBrokerCommand<P>
{
+ private GlusterVolumeTaskReturnForXmlRpc result;
+
+ public GetGlusterVolumeRemoveBricksStatusVDSCommand(P parameters) {
+ super(parameters);
+ }
+
+ @Override
+ protected StatusForXmlRpc getReturnStatus() {
+ return result.mStatus;
+ }
+
+ @Override
+ protected void ExecuteVdsBrokerCommand() {
+ String volumeName = getParameters().getVolumeName();
+ List<GlusterBrickEntity> bricksList = getParameters().getBricks();
+ List<String> brickNames = new ArrayList<String>();
+ for (GlusterBrickEntity brick : bricksList) {
+ brickNames.add(brick.getQualifiedName());
+ }
+
+ result = getBroker().glusterVolumeRemoveBrickStatus(volumeName,
(String[])brickNames.toArray(), getParameters().getReplicaCount());
+ proceedProxyReturnValue();
+
+ setReturnValue(result.getStatusDetails());
+ }
+
+}
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 2415bec..a659460 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
@@ -264,4 +264,6 @@
StoragePoolInfoReturnForXmlRpc getStoragePoolInfo(String spUUID);
GlusterVolumeTaskReturnForXmlRpc glusterVolumeRebalanceStatus(String
volumeName);
+
+ GlusterVolumeTaskReturnForXmlRpc glusterVolumeRemoveBrickStatus(String
volumeName, String[] bricksList, int replicaCount);
}
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 4977848..7b428ff 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
@@ -248,4 +248,6 @@
public Map<String, Object> getStoragePoolInfo(String spUUID);
public Map<String, Object> glusterVolumeRebalanceStatus(String volumeName);
+
+ public Map<String, Object> glusterVolumeRemoveBrickStatus(String
volumeName, String[] bricksList, int replicaCount);
}
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 fe4861e..5a7d727 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
@@ -1258,6 +1258,17 @@
}
@Override
+ public GlusterVolumeTaskReturnForXmlRpc
glusterVolumeRemoveBrickStatus(String volumeName, String[] bricksList, int
replicaCount) {
+ try {
+ Map<String, Object> xmlRpcReturnValue =
vdsServer.glusterVolumeRemoveBrickStatus(volumeName, bricksList, replicaCount);
+ GlusterVolumeTaskReturnForXmlRpc wrapper = new
GlusterVolumeTaskReturnForXmlRpc(xmlRpcReturnValue);
+ return wrapper;
+ } catch (UndeclaredThrowableException ute) {
+ throw new XmlRpcRunTimeException(ute);
+ }
+ }
+
+ @Override
public StatusOnlyReturnForXmlRpc setMOMPolicyParameters(Map<String,
Object> key_value_store) {
try {
Map<String, Object> xmlRpcReturnValue =
vdsServer.setMOMPolicyParameters(key_value_store);
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 4d157ac..544d54e 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
@@ -775,4 +775,7 @@
@DefaultStringValue("Failed to get gluster volume rebalance status")
String GlusterVolumeRebalanceStatusFailedException();
+
+ @DefaultStringValue("Failed to get status of gluster volume remove bricks")
+ String GlusterVolumeRemoveBrickStatusFailed();
}
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 9a96b90..92c94c4 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
@@ -367,3 +367,4 @@
GlusterServicesActionFailed=Gluster service action failed
GlusterServiceActionNotSupported=Gluster service action not supported
GlusterVolumeRebalanceStatusFailedException=Failed to get gluster volume
rebalance status
+GlusterVolumeRemoveBrickStatusFailed=Failed to get status of gluster volume
remove bricks
--
To view, visit http://gerrit.ovirt.org/19106
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I21da52b06c6d48fa5e344909b7d78d044c902b4b
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Shubhendu Tripathi <shtri...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
