diff options
| author | Selvasundaram <selvam@gluster.com> | 2011-07-07 15:56:22 +0530 |
|---|---|---|
| committer | Selvasundaram <selvam@gluster.com> | 2011-07-07 15:56:22 +0530 |
| commit | 9862c8c2da1414b4e70fa788e2ab53db1775b525 (patch) | |
| tree | 55185d7a536f9e273db81b15d187582f9df27dfa /src/com.gluster.storage.management.server | |
| parent | f82c3a6b43aca0c2502e0241dd6508b05d179b10 (diff) | |
| parent | bcef8a077f87b760fd04be847676e7ab9000f6f3 (diff) | |
Merge branch 'master' of github.com:gluster/console
Diffstat (limited to 'src/com.gluster.storage.management.server')
2 files changed, 3 insertions, 2 deletions
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 31e02cd4..e052685c 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.getCompleted() / initDiskStatusResponse.getTotal() * 100); + taskStatus.setPercentCompleted(Math.round(initDiskStatusResponse.getCompletedBlocks() + / initDiskStatusResponse.getTotalBlocks() * 100)); } taskStatus.setMessage(initDiskStatusResponse.getMessage()); |