diff options
author | Dhandapani <dhandapani@gluster.com> | 2011-12-09 17:09:28 +0530 |
---|---|---|
committer | Dhandapani <dhandapani@gluster.com> | 2011-12-09 17:10:26 +0530 |
commit | 99308c132d8c50ffa852bc5c5510e526e52a00d1 (patch) | |
tree | 062eb1b40707123fb3f457d483310369a5f7fc19 /src/org.gluster.storage.management.console/src/org/gluster | |
parent | f74c1187a69f7033aaca9133a5b406b5107c2436 (diff) |
Bug 3857: Replace-brick operation fails. Fails to generate tasks view - fixed
Diffstat (limited to 'src/org.gluster.storage.management.console/src/org/gluster')
6 files changed, 23 insertions, 6 deletions
diff --git a/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/IImageKeys.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/IImageKeys.java index 6a6c96eb..c1d7dd24 100644 --- a/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/IImageKeys.java +++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/IImageKeys.java @@ -81,6 +81,7 @@ public interface IImageKeys { public static final String COMMIT_TASK_32x32 = "icons/tango/32x32/commit-task.png"; public static final String PAUSE_TASK_16x16 = "icons/tango/16x16/pause.png"; public static final String RESUME_TASK_16x16 = "icons/tango/16x16/start.png"; + public static final String ERROR_TASK_16x16 = "icons/tango/16x16/error.png"; public static final String STOP_TASK_16x16 = "icons/tango/16x16/stop.png"; public static final String CLEAR_TASK_16x16 = "icons/tango/16x16/close_task.png"; public static final String COMPLETED_TASK_16x16 = "icons/tango/16x16/task-completed.png"; diff --git a/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/TasksTableLabelProvider.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/TasksTableLabelProvider.java index 65b37c3a..72f25561 100644 --- a/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/TasksTableLabelProvider.java +++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/TasksTableLabelProvider.java @@ -48,7 +48,9 @@ public class TasksTableLabelProvider extends TableLabelProviderAdapter { case Status.STATUS_CODE_RUNNING: return guiHelper.getImage(IImageKeys.RESUME_TASK_16x16); case Status.STATUS_CODE_FAILURE: - return guiHelper.getImage(IImageKeys.STATUS_OFFLINE_16x16); + return guiHelper.getImage(IImageKeys.STATUS_OFFLINE_16x16); + case Status.STATUS_CODE_ERROR: + return guiHelper.getImage(IImageKeys.ERROR_TASK_16x16); default: break; } diff --git a/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/ClearTaskAction.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/ClearTaskAction.java index d22d7650..d22abe6c 100644 --- a/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/ClearTaskAction.java +++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/ClearTaskAction.java @@ -51,7 +51,8 @@ public class ClearTaskAction extends AbstractActionDelegate { if (selectedEntity instanceof TaskInfo) { taskInfo = (TaskInfo) selectedEntity; action.setEnabled(taskInfo.getStatus().getCode() == Status.STATUS_CODE_SUCCESS - || taskInfo.getStatus().getCode() == Status.STATUS_CODE_FAILURE); + || taskInfo.getStatus().getCode() == Status.STATUS_CODE_FAILURE + || taskInfo.getStatus().getCode() == Status.STATUS_CODE_ERROR); } else { action.setEnabled(false); } diff --git a/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/RebalanceVolumeAction.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/RebalanceVolumeAction.java index 2f8d8f61..2af6397b 100644 --- a/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/RebalanceVolumeAction.java +++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/RebalanceVolumeAction.java @@ -54,7 +54,13 @@ public class RebalanceVolumeAction extends AbstractActionDelegate { if (taskInfo != null) { GlusterDataModelManager.getInstance().addTask(taskInfo); } - showInfoDialog(actionDesc, "Volume [" + volume.getName() + "] rebalance started successfully!"); + if (taskInfo.getStatus().getCode() == Status.STATUS_CODE_ERROR) { + showInfoDialog(actionDesc, "Volume [" + volume.getName() + + "] rebalance started, but following error occured [" + taskInfo.getStatus().getMessage() + + "]"); + } else { + showInfoDialog(actionDesc, "Volume [" + volume.getName() + "] rebalance started successfully!"); + } guiHelper.showTaskView(); } catch (Exception e) { showErrorDialog(actionDesc, "Volume rebalance could not be started on [" + volume.getName() + "]! Error: [" diff --git a/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/StopTaskAction.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/StopTaskAction.java index 5bf99484..1a387414 100644 --- a/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/StopTaskAction.java +++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/StopTaskAction.java @@ -52,8 +52,9 @@ public class StopTaskAction extends AbstractActionDelegate { if (selectedEntity instanceof TaskInfo) { taskInfo = (TaskInfo) selectedEntity; action.setEnabled(taskInfo.getStopSupported() - && (taskInfo.getStatus().getCode() == Status.STATUS_CODE_PAUSE - || taskInfo.getStatus().getCode() == Status.STATUS_CODE_RUNNING)); + && (taskInfo.getStatus().getCode() == Status.STATUS_CODE_PAUSE + || taskInfo.getStatus().getCode() == Status.STATUS_CODE_RUNNING || taskInfo.getStatus() + .getCode() == Status.STATUS_CODE_ERROR)); } } diff --git a/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/dialogs/MigrateBrickWizard.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/dialogs/MigrateBrickWizard.java index 7baae6b5..c530ba01 100644 --- a/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/dialogs/MigrateBrickWizard.java +++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/dialogs/MigrateBrickWizard.java @@ -95,7 +95,13 @@ public class MigrateBrickWizard extends Wizard { return true; } } - MessageDialog.openInformation(getShell(), dialogTitle, "Brick migration started successfully"); + if (taskInfo.getStatus().getCode() == TaskStatus.STATUS_CODE_RUNNING) { + MessageDialog.openInformation(getShell(), dialogTitle, "Brick migration started successfully"); + } else { + MessageDialog.openInformation(getShell(), dialogTitle, + "Brick migration started, but following error occured [" + taskInfo.getStatus().getMessage() + + "]"); + } GUIHelper.getInstance().showTaskView(); } catch (Exception e) { |