Initialize disk enhancement

3 files changed, 5 insertions, 4 deletions

diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/AbstractDisksPage.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/AbstractDisksPage.java
index a53f500d..63cf65ed 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/AbstractDisksPage.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/AbstractDisksPage.java
@@ -220,11 +220,11 @@ public abstract class AbstractDisksPage extends AbstractTableViewerPage<Disk> im
 				fsType = GlusterConstants.FSTYPE_XFS;
 			}
 
-			updateStatus(DISK_STATUS.INITIALIZING, true);
-
 			GlusterServersClient serversClient = new GlusterServersClient();
 			serversClient.initializeDisk(disk.getServerName(), disk.getName(), fsType);
 
+			updateStatus(DISK_STATUS.INITIALIZING, true); 
+			
 			guiHelper.showProgressView();
 			new InitializeDiskJob(disk).schedule();
 		}
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());