Shubhendu Tripathi has uploaded a new change for review. Change subject: gluster: WIP - Include runtime field in rebalance status ......................................................................
gluster: WIP - Include runtime field in rebalance status Included the runtime field in gluster volume rebalance status. Change-Id: I71a20fbb93a9731ca2ff68ddd401589d319226d4 Bug-Url: https://bugzilla.redhat.com/1011883 Signed-off-by: Shubhendu Tripathi <shtri...@redhat.com> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterVolumeTaskStatusForHost.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterVolumeTaskReturnForXmlRpc.java 2 files changed, 14 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/64/19664/1 diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterVolumeTaskStatusForHost.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterVolumeTaskStatusForHost.java index b947ac5..e36892c 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterVolumeTaskStatusForHost.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterVolumeTaskStatusForHost.java @@ -1,10 +1,13 @@ package org.ovirt.engine.core.common.businessentities.gluster; +import org.ovirt.engine.core.compat.Guid; + public class GlusterVolumeTaskStatusForHost extends GlusterVolumeTaskStatusDetail { private static final long serialVersionUID = -1134758927239004415L; private String hostName; + private Guid hostUuid; public GlusterVolumeTaskStatusForHost() { } @@ -15,4 +18,10 @@ public void setHostName(String hostName) { this.hostName = hostName; } + public Guid getHostUuid() { + return this.hostUuid; + } + public void setHostUuid(Guid id) { + this.hostUuid = id; + } } diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterVolumeTaskReturnForXmlRpc.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterVolumeTaskReturnForXmlRpc.java index 586232a..ea7682e 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterVolumeTaskReturnForXmlRpc.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterVolumeTaskReturnForXmlRpc.java @@ -6,16 +6,19 @@ import org.ovirt.engine.core.common.businessentities.gluster.GlusterVolumeTaskStatusDetail; import org.ovirt.engine.core.common.businessentities.gluster.GlusterVolumeTaskStatusEntity; import org.ovirt.engine.core.common.businessentities.gluster.GlusterVolumeTaskStatusForHost; +import org.ovirt.engine.core.compat.Guid; public class GlusterVolumeTaskReturnForXmlRpc extends GlusterTaskInfoReturnForXmlRpc { private static final String HOST_LIST = "hosts"; private static final String SUMMARY = "summary"; private static final String HOST_NAME = "name"; + private static final String HOST_UUID = "id"; private static final String FILES_MOVED = "filesMoved"; private static final String TOTAL_SIZE_MOVED = "totalSizeMoved"; private static final String FILES_SCANNED = "filesScanned"; private static final String FILES_FAILED = "filesFailed"; private static final String STATUS = "status"; + private static final String RUNTIME = "runtime"; private final GlusterVolumeTaskStatusEntity statusDetails = new GlusterVolumeTaskStatusEntity(); @@ -37,6 +40,7 @@ private GlusterVolumeTaskStatusForHost getStatusForNode(Map<String, Object> nodeStatus) { GlusterVolumeTaskStatusForHost rebalanceStatusForHost = new GlusterVolumeTaskStatusForHost(); rebalanceStatusForHost.setHostName((String)nodeStatus.get(HOST_NAME)); + rebalanceStatusForHost.setHostUuid(nodeStatus.get(HOST_UUID) != null ? new Guid((String)nodeStatus.get(HOST_UUID)) : null); populateGlusterVolumeTaskStatusDetail(rebalanceStatusForHost, nodeStatus); return rebalanceStatusForHost; @@ -48,6 +52,7 @@ detail.setFilesFailed((Integer)map.get(FILES_FAILED)); detail.setTotalSizeMoved(((Integer)map.get(TOTAL_SIZE_MOVED)).longValue()); detail.setStatus(GlusterAsyncTaskStatus.from((String)map.get(STATUS)).getJobExecutionStatus()); + detail.setRunTime((Integer)map.get(RUNTIME)); } public GlusterVolumeTaskStatusEntity getStatusDetails() { -- To view, visit http://gerrit.ovirt.org/19664 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I71a20fbb93a9731ca2ff68ddd401589d319226d4 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
