summaryrefslogtreecommitdiffstats
path: root/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions
diff options
context:
space:
mode:
Diffstat (limited to 'src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions')
-rw-r--r--src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/ClearTaskAction.java3
-rw-r--r--src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/RebalanceVolumeAction.java8
-rw-r--r--src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/StopTaskAction.java5
3 files changed, 12 insertions, 4 deletions
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));
}
}