Merge branch 'master' of github.com:gluster/console

Conflicts:
	src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/tasks/Task.java

7 files changed, 144 insertions, 86 deletions

diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/GlusterServersResource.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/GlusterServersResource.java
index a9ef7fbb..1f4b15de 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/GlusterServersResource.java
+++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/GlusterServersResource.java
@@ -414,13 +414,14 @@ public class GlusterServersResource extends AbstractServersResource {
 			return badRequestResponse("Disk name must not be empty!");
 		}
 
-		InitializeDiskTask initializeTask = new InitializeDiskTask(clusterService, clusterName, diskName, serverName);
+		InitializeDiskTask initializeTask = new InitializeDiskTask(clusterService, clusterName, serverName, diskName);
 		try {
 			initializeTask.start();
 			taskResource.addTask(initializeTask);
-			return acceptedResponse(RESTConstants.RESOURCE_PATH_CLUSTERS + "/" + clusterName + "/" + RESOURCE_TASKS
-					+ "/" + initializeTask.getId());
-		} catch (ConnectionException e) {
+
+			return acceptedResponse(RESTConstants.RESOURCE_PATH_CLUSTERS + "/" + clusterName + "/" + RESOURCE_TASKS + "/"
+					+ initializeTask.getId());
+		} catch (Exception e) {
 			return errorResponse(e.getMessage());
 		}
 	}
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/VolumesResource.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/VolumesResource.java
index d568d519..4318945c 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/VolumesResource.java
+++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/VolumesResource.java
@@ -978,7 +978,7 @@ public class VolumesResource extends AbstractResource {
 		return rebalanceStart(clusterName, volumeName, layout);
 	}
 	
-	public String rebalanceStart(String clusterName, String volumeName, String layout) {
+	private String rebalanceStart(String clusterName, String volumeName, String layout) {
 		RebalanceVolumeTask rebalanceTask = new RebalanceVolumeTask(clusterService, clusterName, volumeName);
 		rebalanceTask.setLayout(layout);
 		rebalanceTask.start();
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 5f3f8e30..4592b759 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
@@ -20,21 +20,26 @@
  */
 package com.gluster.storage.management.server.tasks;
 
+import com.gluster.storage.management.core.exceptions.ConnectionException;
+import com.gluster.storage.management.core.exceptions.GlusterRuntimeException;
 import com.gluster.storage.management.core.model.Status;
 import com.gluster.storage.management.core.model.TaskInfo;
 import com.gluster.storage.management.core.model.TaskInfo.TASK_TYPE;
 import com.gluster.storage.management.core.model.TaskStatus;
+import com.gluster.storage.management.core.utils.ProcessResult;
 import com.gluster.storage.management.server.services.ClusterService;
+import com.gluster.storage.management.server.utils.GlusterUtil;
 import com.gluster.storage.management.server.utils.SshUtil;
+import com.sun.jersey.core.util.Base64;
 
 public class InitializeDiskTask extends Task {
 
 	private static final String INITIALIZE_DISK_SCRIPT = "initialize_disk.py";
-	private static final String INITIALIZE_DISK_STATUS_SCRIPT = "initialize_disk_status.py";
 	
 	private String serverName;
 	private String diskName;
 	private SshUtil sshUtil = new SshUtil();
+	private GlusterUtil glusterUtil;
 
 	public InitializeDiskTask(ClusterService clusterService, String clusterName, String serverName, String diskName) {
 		super(clusterService, clusterName, TASK_TYPE.DISK_FORMAT, diskName, "Initialize disk " + serverName + ":"
@@ -50,22 +55,29 @@ public class InitializeDiskTask extends Task {
 
 	@Override
 	public String getId() {
-		return taskInfo.getType() + "-" + serverName + ":" + diskName;
+		return new String(
+				Base64.encode(getClusterName() + "-" + taskInfo.getType() + "-" + serverName + ":" + diskName));
 	}
 
 	@Override
 	public void resume() {
-		getTaskInfo().setStatus( new TaskStatus( new Status(Status.STATUS_CODE_FAILURE, "Can not resume disk initialization")));
+		getTaskInfo().setStatus(
+				new TaskStatus(new Status(Status.STATUS_CODE_FAILURE,
+						"Stop/Pause/Resume is not supported in Disk Initialization")));
 	}
 
 	@Override
 	public void stop() {
-		getTaskInfo().setStatus( new TaskStatus( new Status(Status.STATUS_CODE_FAILURE, "Can not stop disk initialization")));
+		getTaskInfo().setStatus(
+				new TaskStatus(new Status(Status.STATUS_CODE_FAILURE,
+						"Stop/Pause/Resume is not supported in Disk Initialization")));
 	}
 
 	@Override
 	public void pause() {
-		getTaskInfo().setStatus( new TaskStatus( new Status(Status.STATUS_CODE_FAILURE, "Can not suspend disk initialization")));
+		getTaskInfo().setStatus(
+				new TaskStatus(new Status(Status.STATUS_CODE_FAILURE,
+						"Stop/Pause/Resume is not supported in Disk Initialization")));
 	}
 	
 	@Override
@@ -85,17 +97,37 @@ public class InitializeDiskTask extends Task {
 
 	@Override
 	public void start() {
-		getTaskInfo().setStatus(
-				new TaskStatus(new Status(sshUtil.executeRemote(getServerName(), INITIALIZE_DISK_SCRIPT + " "
-						+ getDiskName()))));
+		try {
+			startInitializeDisk(serverName);
+		} catch(ConnectionException e) {
+			// online server might have gone offline.  update the failure status
+			getTaskInfo().setStatus(new TaskStatus(new Status(Status.STATUS_CODE_FAILURE, e.getMessage())));
+		}
+	}
+
+	private void startInitializeDisk(String serverName) {
+		ProcessResult processResult = sshUtil.executeRemote(serverName, INITIALIZE_DISK_SCRIPT + " " + getDiskName());
+		if (processResult.isSuccess()) {
+			getTaskInfo().setStatus(new TaskStatus(new Status(Status.STATUS_CODE_RUNNING, processResult.getOutput())));
+			return;
+		}
+
+		// if we reach here, it means Initialize disk start failed.
+		throw new GlusterRuntimeException(processResult.toString());
+		
 	}
 
 	@Override
 	public TaskStatus checkStatus() {
-		return new TaskStatus(new Status(sshUtil.executeRemote(getServerName(), INITIALIZE_DISK_STATUS_SCRIPT + " "
-				+ getDiskName())));
+		
+		try {
+			return glusterUtil.checkInitializeDiskStatus(serverName, getDiskName());
+		} catch(ConnectionException e) {
+			// online server might have gone offline. update the failure status
+			return new TaskStatus(new Status(Status.STATUS_CODE_FAILURE, e.getMessage()));
+		}
 	}
-
+	
 	public void setDiskName(String diskName) {
 		this.diskName = diskName;
 	}
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/tasks/RebalanceVolumeTask.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/tasks/RebalanceVolumeTask.java
index 7f9fb6bf..f94613e0 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/tasks/RebalanceVolumeTask.java
+++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/tasks/RebalanceVolumeTask.java
@@ -28,33 +28,40 @@ import com.gluster.storage.management.core.model.TaskInfo.TASK_TYPE;
 import com.gluster.storage.management.core.model.TaskStatus;
 import com.gluster.storage.management.core.utils.ProcessResult;
 import com.gluster.storage.management.server.services.ClusterService;
+import com.gluster.storage.management.server.utils.GlusterUtil;
 import com.gluster.storage.management.server.utils.SshUtil;
+import com.sun.jersey.core.util.Base64;
 
 public class RebalanceVolumeTask extends Task {
 
 	private String layout;
+	private String serverName;
 	private SshUtil sshUtil = new SshUtil();
+	private GlusterUtil glusterUtil = new GlusterUtil();
 
 	public RebalanceVolumeTask(ClusterService clusterService, String clusterName, TaskInfo taskInfo) {
 		super(clusterService, clusterName, taskInfo);
 	}
 
 	public RebalanceVolumeTask(ClusterService clusterService, String clusterName, String volumeName) {
-		super(clusterService, clusterName, TASK_TYPE.VOLUME_REBALANCE, volumeName, "Volume rebalance running on " + volumeName, false, true, false);
+		super(clusterService, clusterName, TASK_TYPE.VOLUME_REBALANCE, volumeName, "Volume " + volumeName
+				+ " Rebalance", false, true, false);
 	}
 
 	@Override
 	public String getId() {
-		return taskInfo.getType() + "-" + taskInfo.getReference();
+		return new String(Base64.encode(getClusterName() + "-" + taskInfo.getType() + "-" + taskInfo.getReference()));
 	}
 
 	@Override
 	public void start() {
 		try {
-			startRebalance(getOnlineServer().getName());
+			serverName = getOnlineServer().getName();
+			startRebalance(serverName);
 		} catch(ConnectionException e) {
 			// online server might have gone offline. try with a new one
-			startRebalance(getNewOnlineServer().getName());
+			serverName = getNewOnlineServer().getName();
+			startRebalance(serverName);
 		}
 	}
 
@@ -62,11 +69,10 @@ public class RebalanceVolumeTask extends Task {
 		String command = "gluster volume rebalance " + getTaskInfo().getReference() + " " + getLayout() + " start";
 		ProcessResult processResult = sshUtil.executeRemote(serverName, command);
 		if (processResult.isSuccess()) {
-			if (processResult.getOutput().trim().matches(".*has been successful$")) {
-				getTaskInfo().setStatus(new TaskStatus(new Status(Status.STATUS_CODE_RUNNING, processResult.getOutput())));
-			}
+			getTaskInfo().setStatus(new TaskStatus(new Status(Status.STATUS_CODE_RUNNING, processResult.getOutput())));
+			return;
 		}
-		
+
 		// if we reach here, it means rebalance start failed.
 		throw new GlusterRuntimeException(processResult.toString());
 	}
@@ -74,70 +80,38 @@ public class RebalanceVolumeTask extends Task {
 	@Override
 	public void resume() {
 		getTaskInfo().setStatus(
-				new TaskStatus(new Status(Status.STATUS_CODE_FAILURE, "Pause/Resume is not supported in Volume Rebalance")));
+				new TaskStatus(new Status(Status.STATUS_CODE_FAILURE,
+						"Pause/Resume is not supported in Volume Rebalance")));
 	}
 
 	@Override
 	public void stop() {
 		try {
-			stopRebalance(getOnlineServer().getName());
-		} catch(ConnectionException e) {
-			// online server might have gone offline. try with a new one
-			stopRebalance(getNewOnlineServer().getName());
+			glusterUtil.stopRebalance(serverName, getTaskInfo().getReference());
+		} catch (ConnectionException e) {
+			// online server might have gone offline. update the failure status
+			getTaskInfo().setStatus(new TaskStatus(new Status(Status.STATUS_CODE_FAILURE, e.getMessage())));
 		}
 	}
 
-	private void stopRebalance(String serverName) {
-		String command = "gluster volume rebalance " + getTaskInfo().getReference() + " stop";
-		ProcessResult processResult = sshUtil.executeRemote(serverName, command);
-		TaskStatus taskStatus = new TaskStatus();
-		if (processResult.isSuccess()) {
-			if (processResult.getOutput().trim().matches(".*has been successful$")) {
-				taskStatus.setCode(Status.STATUS_CODE_SUCCESS);
-			} else {
-				taskStatus.setCode(Status.STATUS_CODE_FAILURE);
-			}
-		} else {
-			taskStatus.setCode(Status.STATUS_CODE_FAILURE);
-		}
-		taskStatus.setMessage(processResult.getOutput()); // Common
-		getTaskInfo().setStatus(taskStatus);
-	}
-
 	@Override
 	public void pause() {
 		getTaskInfo().setStatus(
-				new TaskStatus(new Status(Status.STATUS_CODE_FAILURE, "Pause/Resume is not supported in Volume Rebalance")));
+				new TaskStatus(new Status(Status.STATUS_CODE_FAILURE,
+						"Pause/Resume is not supported in Volume Rebalance")));
 	}
 
 	@Override
 	public TaskStatus checkStatus() {
 		try {
-			return checkRebalanceStatus(getOnlineServer().getName());
+			return glusterUtil.checkRebalanceStatus(serverName, getTaskInfo().getReference());
 		} catch(ConnectionException e) {
-			// online server might have gone offline. try with a new one. 
-			return checkRebalanceStatus(getNewOnlineServer().getName());
+			// 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();
 		}
 	}
 	
-	// TODO: This method should move to glusterUtil
-	private TaskStatus checkRebalanceStatus(String serverName) {
-		String command = "gluster volume rebalance " + getTaskInfo().getReference() + " status";
-		ProcessResult processResult = sshUtil.executeRemote(serverName, command);
-		TaskStatus taskStatus = new TaskStatus();
-		if (processResult.isSuccess()) {
-			if (processResult.getOutput().trim().matches(".*rebalance completed$")) {
-				taskStatus.setCode(Status.STATUS_CODE_SUCCESS);
-			} else {
-				taskStatus.setCode(Status.STATUS_CODE_RUNNING);
-			}
-		} else {
-			taskStatus.setCode(Status.STATUS_CODE_FAILURE);
-		}
-		taskStatus.setMessage(processResult.getOutput()); // Common
-		return taskStatus;
-	}
-
 	public void setLayout(String layout) {
 		this.layout = layout;
 	}
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/tasks/Task.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/tasks/Task.java
index 4fa6e08c..119f6297 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/tasks/Task.java
+++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/tasks/Task.java
@@ -33,7 +33,8 @@ public abstract class Task {
 	protected String clusterName;
 	private ClusterService clusterService;
 	
-	public Task(ClusterService clusterService, String clusterName, TASK_TYPE type, String reference, String desc, boolean canPause, boolean canStop, boolean canCommit) {
+	public Task(ClusterService clusterService, String clusterName, TASK_TYPE type, String reference, String desc,
+			boolean canPause, boolean canStop, boolean canCommit) {
 		TaskInfo taskInfo = new TaskInfo();
 		taskInfo.setType(type);
 		taskInfo.setReference(reference);
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 788e3eab..1dc5eb1a 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
@@ -37,6 +37,7 @@ import com.gluster.storage.management.core.model.GlusterServer;
 import com.gluster.storage.management.core.model.GlusterServer.SERVER_STATUS;
 import com.gluster.storage.management.core.model.Status;
 import com.gluster.storage.management.core.model.TaskInfo;
+import com.gluster.storage.management.core.model.TaskStatus;
 import com.gluster.storage.management.core.model.Volume;
 import com.gluster.storage.management.core.model.Volume.TRANSPORT_TYPE;
 import com.gluster.storage.management.core.model.Volume.VOLUME_STATUS;
@@ -71,6 +72,8 @@ public class GlusterUtil {
 	private static final String VOLUME_TYPE_REPLICATE = "Replicate";
 	
 	private static final GlusterCoreUtil glusterCoreUtil = new GlusterCoreUtil();
+	
+	private static final String INITIALIZE_DISK_STATUS_SCRIPT = "initialize_disk_status.py";
 
 	@Autowired
 	private SshUtil sshUtil;
@@ -550,6 +553,54 @@ public class GlusterUtil {
 			throw new GlusterRuntimeException("Couldn't remove server [" + serverName + "]! Error: " + result);
 		}
 	}
+	
+	public TaskStatus checkRebalanceStatus(String serverName, String volumeName) {
+		String command = "gluster volume rebalance " + volumeName + " status";
+		ProcessResult processResult = sshUtil.executeRemote(serverName, command);
+		TaskStatus taskStatus = new TaskStatus();
+		if (processResult.isSuccess()) {
+			if (processResult.getOutput().trim().matches("^rebalance completed.*")) {
+				taskStatus.setCode(Status.STATUS_CODE_SUCCESS);
+			} else if(processResult.getOutput().trim().matches(".*in progress:.*")) {
+				taskStatus.setCode(Status.STATUS_CODE_RUNNING);
+			} else {
+				taskStatus.setCode(Status.STATUS_CODE_FAILURE);
+			}
+		} else {
+			taskStatus.setCode(Status.STATUS_CODE_FAILURE);
+		}
+		taskStatus.setMessage(processResult.getOutput()); // Common
+		return taskStatus;
+	}
+	
+	public void stopRebalance(String serverName, String volumeName) {
+		String command = "gluster volume rebalance " + volumeName + " stop";
+		ProcessResult processResult = sshUtil.executeRemote(serverName, command);
+		TaskStatus taskStatus = new TaskStatus();
+		if (processResult.isSuccess()) {
+			taskStatus.setCode(Status.STATUS_CODE_SUCCESS);
+			taskStatus.setMessage(processResult.getOutput());
+		}
+	}
+	
+	public TaskStatus checkInitializeDiskStatus(String serverName, String diskName) {
+		ProcessResult processResult = sshUtil.executeRemote(serverName, INITIALIZE_DISK_STATUS_SCRIPT + " " + diskName);
+		TaskStatus taskStatus = new TaskStatus();
+		if (processResult.isSuccess()) {
+			// TODO: Message needs to change according to the script return
+			if (processResult.getOutput().trim().matches(".*Initailize completed$")) {
+				taskStatus.setCode(Status.STATUS_CODE_SUCCESS);
+			} else {
+				// TODO: Percentage completed needs to be set, according to the script output
+				taskStatus.setCode(Status.STATUS_CODE_RUNNING);
+				// taskStatus.setPercentCompleted(processResult.getOutput());
+			}
+		} else {
+			taskStatus.setCode(Status.STATUS_CODE_FAILURE);
+		}
+		taskStatus.setMessage(processResult.getOutput());
+		return taskStatus;
+	}
 
 	public static void main(String args[]) {
 		// List<String> names = new GlusterUtil().getGlusterServerNames();
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/utils/SshUtil.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/utils/SshUtil.java
index d56cd47c..4f0b04cf 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/utils/SshUtil.java
+++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/utils/SshUtil.java
@@ -226,6 +226,10 @@ public class SshUtil {
 		return conn;
 	}
 
+	private boolean wasTerminated(int condition) {
+		return ((condition | ChannelCondition.EXIT_SIGNAL) == condition);
+	}
+
 	private boolean hasErrors(int condition, Session session) {
 		return (hasErrorStream(condition) || (exitedGracefully(condition) && exitedWithError(session)));
 	}
@@ -239,7 +243,7 @@ public class SshUtil {
 	}
 
 	private boolean exitedGracefully(int condition) {
-		return (condition == ChannelCondition.EXIT_STATUS);
+		return (condition | ChannelCondition.EXIT_STATUS) == condition;
 	}
 
 	private boolean hasErrorStream(int condition) {
@@ -292,24 +296,19 @@ public class SshUtil {
 
 	private ProcessResult prepareProcessResult(Session session, int condition, String output) {
 		ProcessResult result = null;
-		switch(condition) {
-		case ChannelCondition.TIMEOUT:
-			result = new ProcessResult(ProcessResult.FAILURE, "Command timed out!");
-			break;
-		case ChannelCondition.EXIT_SIGNAL:
-			// terminated
+		
+		if (wasTerminated(condition)) {
 			result = new ProcessResult(ProcessResult.FAILURE, output);
-			break;
-		default:
-			if (hasErrors(condition, session)) {
-				Integer exitStatus = session.getExitStatus();
-				int statusCode = (exitStatus == null ? ProcessResult.FAILURE : exitStatus);
-				result = new ProcessResult(statusCode, output);
-			} else {
-				result = new ProcessResult(ProcessResult.SUCCESS, output);
-			}
-			break;
+		} else if (timedOut(condition)) {
+			result = new ProcessResult(ProcessResult.FAILURE, "Command timed out!");
+		} else if (hasErrors(condition, session)) {
+			Integer exitStatus = session.getExitStatus();
+			int statusCode = (exitStatus == null ? ProcessResult.FAILURE : exitStatus);
+			result = new ProcessResult(statusCode, output);
+		} else {
+			result = new ProcessResult(ProcessResult.SUCCESS, output);
 		}
+		
 		return result;
 	}