Initialize disk task issue fix

3 files changed, 11 insertions, 4 deletions

diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/AbstractDisksPage.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/AbstractDisksPage.java
index a59a027d..1c63e1c3 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/AbstractDisksPage.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/AbstractDisksPage.java
@@ -42,6 +42,8 @@ import org.eclipse.ui.forms.widgets.ImageHyperlink;
 import com.gluster.storage.management.client.GlusterDataModelManager;
 import com.gluster.storage.management.client.GlusterServersClient;
 import com.gluster.storage.management.client.TasksClient;
+import com.gluster.storage.management.core.model.ClusterListener;
+import com.gluster.storage.management.core.model.DefaultClusterListener;
 import com.gluster.storage.management.core.model.Device;
 import com.gluster.storage.management.core.model.Device.DEVICE_STATUS;
 import com.gluster.storage.management.core.model.Disk;
@@ -71,6 +73,10 @@ public abstract class AbstractDisksPage extends AbstractTableTreeViewerPage<Disk
 		Application.getApplication().addEntityListener(this);
 	}
 	
+	protected ClusterListener createClusterListener() {
+		return new DefaultClusterListener();
+	}
+	
 	private void createInitializeLink(final TreeItem item, final int rowNum, final Device uninitializedDevice) {
 		final Tree tree = treeViewer.getTree();
 		final TreeEditor editor = new TreeEditor(tree);
@@ -232,9 +238,9 @@ public abstract class AbstractDisksPage extends AbstractTableTreeViewerPage<Disk
 					GlusterDataModelManager.getInstance().getModel().getCluster().addTaskInfo(taskInfo);
 				}
 				
-				if (taskInfo.getStatus().getCode() != Status.STATUS_CODE_RUNNING) {
+				if (taskInfo.getStatus().getCode() == Status.STATUS_CODE_RUNNING) {
 					updateStatus(DEVICE_STATUS.INITIALIZING, true);
-				} else if(taskInfo.getStatus().getCode() != Status.STATUS_CODE_SUCCESS) {
+				} else if(taskInfo.getStatus().getCode() == Status.STATUS_CODE_SUCCESS) {
 					updateStatus(DEVICE_STATUS.INITIALIZED, true);
 				}
 				
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 b455a255..0fa49dc3 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
@@ -122,8 +122,8 @@ 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) {
+		if (task.getTaskInfo().getStatus().getCode() == Status.STATUS_CODE_FAILURE
+				|| task.getTaskInfo().getStatus().getCode() == Status.STATUS_CODE_SUCCESS) {
 			return task;
 		}
 		task.getTaskInfo().setStatus(task.checkStatus());
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 6aa63e9e..4f168d66 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
@@ -53,6 +53,7 @@ public class InitializeDiskTask extends Task {
 		setServerName(serverName);
 		setDiskName(diskName);
 		setFsType(fsType);
+		taskInfo.setName(getId());
 		init();
 	}