diff options
| author | Shireesh Anjal <shireesh@gluster.com> | 2011-07-07 13:17:24 +0530 |
|---|---|---|
| committer | Shireesh Anjal <shireesh@gluster.com> | 2011-07-07 13:17:24 +0530 |
| commit | bcef8a077f87b760fd04be847676e7ab9000f6f3 (patch) | |
| tree | 7e3094a3a1e69f7de40637624690433a5103f644 /src/com.gluster.storage.management.server | |
| parent | 3c93882d99b55b4cae1474ac28d61782f986e9c2 (diff) | |
| parent | 1e74112c748f1f872f80d2e539d29f7894f8ddc1 (diff) | |
Merge branch 'master' of github.com:gluster/console
Conflicts:
src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/GlusterDataModelManager.java
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 ec530365..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.getCompleted() / initDiskStatusResponse.getTotal() * 100); + taskStatus.setPercentCompleted(Math.round(initDiskStatusResponse.getCompletedBlocks() + / initDiskStatusResponse.getTotalBlocks() * 100)); } taskStatus.setMessage(initDiskStatusResponse.getMessage()); |