Merge remote branch 'upstream/master'

4 files changed, 26 insertions, 25 deletions

diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/DeleteVolumeAction.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/DeleteVolumeAction.java
index acfbdd28..eca8e789 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/DeleteVolumeAction.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/DeleteVolumeAction.java
@@ -77,17 +77,22 @@ public class DeleteVolumeAction extends AbstractActionDelegate {
 					confirmDelete = true;
 				}
 
-				status = client.deleteVolume(volume, confirmDelete);
-				if (status.isSuccess()) {
+				try {
+					client.deleteVolume(volume, confirmDelete);
 					showInfoDialog(actionDesc, "Volume [" + volume.getName() + "] deleted successfully!");
 					modelManager.deleteVolume(volume);
-				} else {
-					if (status.isPartSuccess()) {
-						showWarningDialog(actionDesc, "Volume deleted, but following error(s) occured: " + status);
-						modelManager.deleteVolume(volume);
-					} else {
+				} catch(Exception e) {
+					showErrorDialog(actionDesc, e.getMessage());
+					
+					// there is a possibility that the error was in post-delete operation, which means
+					// volume was deleted, but some other error happened. check if this is the case,
+					// and if so, update the model manager
+					if(client.volumeExists(volume.getName())) {
 						showErrorDialog(actionDesc, "Volume [" + volume.getName() + "] could not be deleted! Error: ["
-								+ status + "]");
+								+ e.getMessage() + "]");
+					} else {
+						modelManager.deleteVolume(volume);
+						showWarningDialog(actionDesc, "Volume deleted, but following error(s) occured: " + e.getMessage());
 					}
 				}
 			}
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/RemoveDiskAction.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/RemoveDiskAction.java
index ffe2469d..0cad5945 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/RemoveDiskAction.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/RemoveDiskAction.java
@@ -53,10 +53,8 @@ public class RemoveDiskAction extends AbstractActionDelegate {
 				BusyIndicator.showWhile(Display.getDefault(), new Runnable() {
 					public void run() {
 						VolumesClient client = new VolumesClient();
-						Status status = client.removeBricks(volume.getName(), bricks, confirmDelete);
-
-						if (status.isSuccess()) {
-
+						try {
+							client.removeBricks(volume.getName(), bricks, confirmDelete);
 							// Remove the bricks from the volume object
 							for (Brick brick : bricks) {
 								volume.removeBrick(brick);
@@ -66,13 +64,12 @@ public class RemoveDiskAction extends AbstractActionDelegate {
 
 							showInfoDialog(actionDesc, "Volume [" + volume.getName()
 									+ "] bricks(s) removed successfully!");
-						} else {
+						} catch (Exception e) {
 							showErrorDialog(actionDesc, "Volume [" + volume.getName()
-									+ "] bricks(s) could not be removed! Error: [" + status + "]");
+									+ "] bricks(s) could not be removed! Error: [" + e.getMessage() + "]");
 						}
 					}
 				});
-
 			}
 		});
 
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/BricksSelectionPage.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/BricksSelectionPage.java
index a72d83fe..fbfb52d1 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/BricksSelectionPage.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/BricksSelectionPage.java
@@ -96,9 +96,9 @@ public class BricksSelectionPage extends Composite {
 						: columnIndex == DISK_TABLE_COLUMN_INDICES.BRICK_DIRECTORY.ordinal() ? disk.getMountPoint()
 								+ "/" + volumeName
 								: columnIndex == DISK_TABLE_COLUMN_INDICES.FREE_SPACE.ordinal() ? NumberUtil
-										.formatNumber(disk.getFreeSpace())
+										.formatNumber((disk.getFreeSpace() / 1024))
 										: columnIndex == DISK_TABLE_COLUMN_INDICES.TOTAL_SPACE.ordinal() ? NumberUtil
-												.formatNumber(disk.getSpace()) : "Invalid");
+												.formatNumber((disk.getSpace() / 1024)) : "Invalid");
 			}
 		};
 	}
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/VolumeLogsPage.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/VolumeLogsPage.java
index ab1b353d..9bff0213 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/VolumeLogsPage.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/VolumeLogsPage.java
@@ -185,16 +185,15 @@ public class VolumeLogsPage extends Composite {
 					return;
 				}
 
-				LogMessageListResponse response = client.getLogs(volume.getName(), bricksCombo.getText(),
-						severityCombo.getText(), fromTimestamp, toTimestamp, Integer.parseInt(lineCountText.getText()));
-				Status status = response.getStatus();
-				if (status.isSuccess()) {
-					List<VolumeLogMessage> logMessages = response.getLogMessages();
+				try {
+					List<VolumeLogMessage> logMessages = client.getLogs(volume.getName(), bricksCombo.getText(),
+							severityCombo.getText(), fromTimestamp, toTimestamp,
+							Integer.parseInt(lineCountText.getText()));
 					tableViewer.setInput(logMessages.toArray(new VolumeLogMessage[0]));
 					tableViewer.refresh();
-				} else {
-					MessageDialog.openError(getShell(), "Volume Logs", "Error while fetching volume logs: [" + status
-							+ "]");
+				} catch (Exception ex) {
+					MessageDialog.openError(getShell(), "Volume Logs",
+							"Error while fetching volume logs: [" + ex.getMessage() + "]");
 				}
 			}
 		});