anmolbabu has uploaded a new change for review. Change subject: gluster : In the task tab, size of rebalanced files is shown with units ......................................................................
gluster : In the task tab, size of rebalanced files is shown with units The size of files rebalanced was shown in bytes. Now,the size is shown in larger units. Change-Id: Iea6c90a098bfddfb616bc2b8ce58c9d0bb567f66 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1020883 Signed-off-by: Anmol Babu <anb...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterTasksSyncJob.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/gluster/SizeConverter.java 2 files changed, 32 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/11/20511/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterTasksSyncJob.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterTasksSyncJob.java index a850389..1a52453 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterTasksSyncJob.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterTasksSyncJob.java @@ -26,6 +26,7 @@ import org.ovirt.engine.core.common.job.JobExecutionStatus; import org.ovirt.engine.core.common.job.Step; import org.ovirt.engine.core.common.job.StepEnum; +import org.ovirt.engine.core.common.utils.gluster.SizeConverter; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.dal.job.ExecutionMessageDirector; import org.ovirt.engine.core.utils.log.Log; @@ -112,7 +113,18 @@ //we have already processed the task continue; } - step.setDescription(getTaskMessage(cluster,step.getStepType(),task)); + String message = getTaskMessage(cluster,step.getStepType(),task); + if(message.contains("Total size moved")) { + int start = message.lastIndexOf(' ') + 1; + int end = message.length() - 1; + String sSize = message.substring(start, end); + Long size = Long.parseLong(sSize); + sSize = SizeConverter.toString(size); + StringBuilder tmp = new StringBuilder(message); + tmp = tmp.replace(start, end, sSize); + message = new String(tmp.toString()); + } + step.setDescription(message); if (hasTaskCompleted(task)) { step.markStepEnded(task.getStatus()); endStepJob(step); diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/gluster/SizeConverter.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/gluster/SizeConverter.java index 89b5d9d..a963497 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/gluster/SizeConverter.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/gluster/SizeConverter.java @@ -30,4 +30,23 @@ long toType = toUnit.getUnitWeight(); return (size) * ((Math.pow(CONVERT_FACTOR, fromType)) / (Math.pow(CONVERT_FACTOR, toType))); } + + public static String toString(long size) { + //Assuming incoming size is in bytes. + StringBuilder result = new StringBuilder(); + if(size > BYTES_IN_GB) { + result.append(convert(size, SizeUnit.BYTES, SizeUnit.GB)); + result.append("GB"); + } else if(size > BYTES_IN_MB) { + result.append(convert(size, SizeUnit.BYTES, SizeUnit.MB)); + result.append("MB"); + } else if(size > BYTES_IN_KB) { + result.append(convert(size, SizeUnit.BYTES, SizeUnit.KB)); + result.append("KB"); + } else { + result.append(size); + result.append("Bytes"); + } + return result.toString(); + } } -- To view, visit http://gerrit.ovirt.org/20511 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iea6c90a098bfddfb616bc2b8ce58c9d0bb567f66 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
