diff options
| author | Dhandapani <dhandapani@gluster.com> | 2011-07-07 17:55:05 +0530 |
|---|---|---|
| committer | Dhandapani <dhandapani@gluster.com> | 2011-07-07 17:55:05 +0530 |
| commit | 33795a983d4196d208faa9a376e85a61dcf80688 (patch) | |
| tree | 7097a92d4c54522b5898601740baa27d04f90fa8 /src/com.gluster.storage.management.gui | |
| parent | 3ac28ddf3531d2dd1914533d83a393359e9307b7 (diff) | |
| parent | 5e04ff19a21ed84aa59004bb8040e1a0d6734542 (diff) | |
Merge branch 'master' of git@github.com:gluster/console
Diffstat (limited to 'src/com.gluster.storage.management.gui')
2 files changed, 13 insertions, 3 deletions
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/ClearTaskAction.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/ClearTaskAction.java index 4a580d05..c22eca43 100644 --- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/ClearTaskAction.java +++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/ClearTaskAction.java @@ -19,6 +19,7 @@ public class ClearTaskAction extends AbstractActionDelegate { try { new TasksClient().deleteTask(taskInfo.getName()); // taskId modelManager.removeTask(taskInfo); + action.setEnabled(false); // TODO disable other task buttons } catch (Exception e) { showErrorDialog(actionDesc, "Task [" + taskInfo.getName() + "] could not be cleared! Error: [" + e.getMessage() + "]"); @@ -42,5 +43,4 @@ public class ClearTaskAction extends AbstractActionDelegate { public void dispose() { } - } diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/RebalanceVolumeAction.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/RebalanceVolumeAction.java index a203dfb4..7e44c43b 100644 --- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/RebalanceVolumeAction.java +++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/RebalanceVolumeAction.java @@ -18,10 +18,15 @@ *******************************************************************************/ package com.gluster.storage.management.gui.actions; +import java.net.URI; + import org.eclipse.jface.action.IAction; import org.eclipse.jface.viewers.ISelection; +import com.gluster.storage.management.client.GlusterDataModelManager; +import com.gluster.storage.management.client.TasksClient; import com.gluster.storage.management.client.VolumesClient; +import com.gluster.storage.management.core.model.TaskInfo; import com.gluster.storage.management.core.model.Volume; public class RebalanceVolumeAction extends AbstractActionDelegate { @@ -31,13 +36,18 @@ public class RebalanceVolumeAction extends AbstractActionDelegate { protected void performAction(final IAction action) { final String actionDesc = action.getDescription(); try { - new VolumesClient().rebalanceStart(volume.getName(), false, false, false); + URI uri = new VolumesClient().rebalanceStart(volume.getName(), false, false, false); + // Add the task to model + TasksClient taskClient = new TasksClient(); + TaskInfo taskInfo = taskClient.getTaskInfo(uri); + if (taskInfo != null && taskInfo instanceof TaskInfo) { + GlusterDataModelManager.getInstance().getModel().getCluster().addTaskInfo(taskInfo); + } showInfoDialog(actionDesc, "Volume [" + volume.getName() + "] rebalance started successfully!"); } catch (Exception e) { showErrorDialog(actionDesc, "Volume rebalance could not be started on [" + volume.getName() + "]! Error: [" + e.getMessage() + "]"); } - } @Override |