diff options
Diffstat (limited to 'src/org.gluster.storage.management.gateway/src/org/gluster/storage')
3 files changed, 7 insertions, 8 deletions
diff --git a/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/resources/v1_0/TasksResource.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/resources/v1_0/TasksResource.java index 9efe51b8..e147a7a4 100644 --- a/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/resources/v1_0/TasksResource.java +++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/resources/v1_0/TasksResource.java @@ -192,7 +192,8 @@ public class TasksResource extends AbstractResource { if(taskOperation == null || taskOperation.isEmpty()) { int taskStatus = task.getTaskInfo().getStatus().getCode(); - if (taskStatus == Status.STATUS_CODE_SUCCESS || taskStatus == Status.STATUS_CODE_FAILURE) { + if (taskStatus == Status.STATUS_CODE_SUCCESS || taskStatus == Status.STATUS_CODE_FAILURE + || taskStatus == Status.STATUS_CODE_ERROR) { taskOperation = RESTConstants.TASK_DELETE; } else { taskOperation = RESTConstants.TASK_STOP; diff --git a/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/tasks/MigrateBrickTask.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/tasks/MigrateBrickTask.java index 7e61f615..8f0f4ef1 100644 --- a/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/tasks/MigrateBrickTask.java +++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/tasks/MigrateBrickTask.java @@ -105,7 +105,6 @@ public class MigrateBrickTask extends Task { String volumeName = getTaskInfo().getReference().split("#")[0]; glusterInterface.startBrickMigration(onlineServerName, volumeName, getFromBrick(), getToBrick()); getTaskInfo().setStatus(new TaskStatus(new Status(Status.STATUS_CODE_RUNNING, "Brick Migration Started."))); - System.out.println(getTaskInfo().getStatus().toString()); } @Override @@ -195,11 +194,8 @@ public class MigrateBrickTask extends Task { // online server might have gone offline. try with a new one. return checkMigrationStatus(getNewOnlineServer().getName()); } else { - if(e instanceof GlusterRuntimeException) { - throw ((GlusterRuntimeException)e); - } else { - throw new GlusterRuntimeException("Exception while checking brick migration status!", e); - } + getTaskInfo().setStatus(new TaskStatus(new Status(Status.STATUS_CODE_ERROR, e.getMessage()))); + return taskInfo.getStatus(); } } } diff --git a/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/tasks/RebalanceVolumeTask.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/tasks/RebalanceVolumeTask.java index ef8563ea..3f68206b 100644 --- a/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/tasks/RebalanceVolumeTask.java +++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/tasks/RebalanceVolumeTask.java @@ -119,9 +119,11 @@ public class RebalanceVolumeTask extends Task { // online server might have gone offline. update the failure status getTaskInfo().setStatus(new TaskStatus(new Status(Status.STATUS_CODE_FAILURE, e.getMessage()))); return getTaskInfo().getStatus(); + } else { + getTaskInfo().setStatus(new TaskStatus(new Status(Status.STATUS_CODE_ERROR, e.getMessage()))); + return getTaskInfo().getStatus(); } } - return null; } public void setLayout(String layout) { |