diff options
Diffstat (limited to 'src/com.gluster.storage.management.server')
3 files changed, 9 insertions, 7 deletions
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/v1_0/TasksResource.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/v1_0/TasksResource.java index 43c9e35f..b455a255 100644 --- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/v1_0/TasksResource.java +++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/v1_0/TasksResource.java @@ -47,6 +47,7 @@ import org.springframework.stereotype.Component; import com.gluster.storage.management.core.constants.RESTConstants; import com.gluster.storage.management.core.exceptions.GlusterRuntimeException; import com.gluster.storage.management.core.exceptions.GlusterValidationException; +import com.gluster.storage.management.core.model.Status; import com.gluster.storage.management.core.model.TaskInfo; import com.gluster.storage.management.core.response.TaskInfoListResponse; import com.gluster.storage.management.server.tasks.Task; @@ -120,6 +121,11 @@ public class TasksResource extends AbstractResource { private Task checkTaskStatus(String taskId) { Task task = getTask(taskId); + // No status check required if the task already complete or failure + if (task.getTaskInfo().getStatus() == Status.STATUS_FAILURE + || task.getTaskInfo().getStatus() == Status.STATUS_SUCCESS) { + return task; + } task.getTaskInfo().setStatus(task.checkStatus()); return task; } diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/tasks/InitializeDiskTask.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/tasks/InitializeDiskTask.java index ea9dd7e5..2fe2373b 100644 --- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/tasks/InitializeDiskTask.java +++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/tasks/InitializeDiskTask.java @@ -104,11 +104,7 @@ public class InitializeDiskTask extends Task { return TASK_TYPE.DISK_FORMAT; } - @Override - public TaskInfo getTaskInfo() { - return getTaskInfo(); - } - + @Override public void start() { try { diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/utils/GlusterUtil.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/utils/GlusterUtil.java index 449dd269..a32c4f18 100644 --- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/utils/GlusterUtil.java +++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/utils/GlusterUtil.java @@ -591,9 +591,9 @@ public class GlusterUtil { InitDiskStatusResponse initDiskStatusResponse = (InitDiskStatusResponse) response; - if (initDiskStatusResponse.getStatus() == FORMAT_STATUS.COMPLETED) { + if (initDiskStatusResponse.getFormatStatus() == FORMAT_STATUS.COMPLETED) { taskStatus.setCode(Status.STATUS_CODE_SUCCESS); - } else if (initDiskStatusResponse.getStatus() == FORMAT_STATUS.IN_PROGRESS) { + } else if (initDiskStatusResponse.getFormatStatus() == FORMAT_STATUS.IN_PROGRESS) { taskStatus.setCode(Status.STATUS_CODE_RUNNING); taskStatus.setPercentCompleted(Math.round(initDiskStatusResponse.getCompletedBlocks() / initDiskStatusResponse.getTotalBlocks() * 100)); |