From b1facccacf33b47682f3257f7fbc6ba394ec6b79 Mon Sep 17 00:00:00 2001 From: Dhandapani Date: Wed, 6 Jul 2011 15:06:18 +0530 Subject: Initialize disk enhancement --- .../management/server/resources/v1_0/GlusterServersResource.java | 2 +- .../src/com/gluster/storage/management/server/utils/GlusterUtil.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'src/com.gluster.storage.management.server') diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/v1_0/GlusterServersResource.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/v1_0/GlusterServersResource.java index 1430d24f..b97d47f8 100644 --- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/v1_0/GlusterServersResource.java +++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/v1_0/GlusterServersResource.java @@ -417,7 +417,7 @@ public class GlusterServersResource extends AbstractServersResource { } if (fsType == null || fsType.isEmpty()) { - return badRequestResponse("FSType must not be empty!"); + return badRequestResponse("Parameter [" + FORM_PARAM_FSTYPE + "] is missing in request!"); } InitializeDiskTask initializeTask = new InitializeDiskTask(clusterService, clusterName, serverName, diskName, fsType); diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/utils/GlusterUtil.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/utils/GlusterUtil.java index 7b8fc9b5..e614641c 100644 --- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/utils/GlusterUtil.java +++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/utils/GlusterUtil.java @@ -595,7 +595,8 @@ public class GlusterUtil { taskStatus.setCode(Status.STATUS_CODE_SUCCESS); } else if (initDiskStatusResponse.getStatus() == FORMAT_STATUS.IN_PROGRESS) { taskStatus.setCode(Status.STATUS_CODE_RUNNING); - taskStatus.setPercentCompleted(initDiskStatusResponse.getCompletedBlocks() / initDiskStatusResponse.getTotalBlocks() * 100); + taskStatus.setPercentCompleted(Math.round(initDiskStatusResponse.getCompletedBlocks() + / initDiskStatusResponse.getTotalBlocks() * 100)); } taskStatus.setMessage(initDiskStatusResponse.getMessage()); -- cgit