Repository: airavata Updated Branches: refs/heads/master 05de4b430 -> f558deeb1
Handling Slurm output error scenario Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/367a0ff2 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/367a0ff2 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/367a0ff2 Branch: refs/heads/master Commit: 367a0ff20fc6922aa2e4b388e20ebaf56a3bbbbc Parents: dde86a5 Author: lahiru <[email protected]> Authored: Wed Mar 12 17:18:44 2014 -0400 Committer: lahiru <[email protected]> Committed: Wed Mar 12 17:18:44 2014 -0400 ---------------------------------------------------------------------- .../apache/airavata/gsi/ssh/api/job/OutputParser.java | 9 +++++---- .../airavata/gsi/ssh/api/job/SlurmOutputParser.java | 12 +++++++----- .../airavata/gsi/ssh/impl/GSISSHAbstractCluster.java | 1 - 3 files changed, 12 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/367a0ff2/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/job/OutputParser.java ---------------------------------------------------------------------- diff --git a/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/job/OutputParser.java b/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/job/OutputParser.java index a74746c..7c97426 100644 --- a/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/job/OutputParser.java +++ b/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/job/OutputParser.java @@ -20,6 +20,7 @@ */ package org.apache.airavata.gsi.ssh.api.job; +import org.apache.airavata.gsi.ssh.api.SSHApiException; import org.apache.airavata.gsi.ssh.impl.JobStatus; import java.util.List; @@ -32,14 +33,14 @@ public interface OutputParser { * @param descriptor * @return */ - public void parse(JobDescriptor descriptor,String rawOutput); + public void parse(JobDescriptor descriptor,String rawOutput)throws SSHApiException; /** * This can be used to parse the result of a job submission to get the JobID * @param rawOutput * @return */ - public String parse(String rawOutput); + public String parse(String rawOutput)throws SSHApiException; /** @@ -47,12 +48,12 @@ public interface OutputParser { * @param jobID * @param rawOutput */ - public JobStatus parse(String jobID, String rawOutput); + public JobStatus parse(String jobID, String rawOutput)throws SSHApiException; /** * This can be used to parse a big output and get multipleJob statuses * @param statusMap list of status map will return and key will be the job ID * @param rawOutput */ - public void parse(Map<String,JobStatus> statusMap, String rawOutput); + public void parse(Map<String,JobStatus> statusMap, String rawOutput)throws SSHApiException; } http://git-wip-us.apache.org/repos/asf/airavata/blob/367a0ff2/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/job/SlurmOutputParser.java ---------------------------------------------------------------------- diff --git a/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/job/SlurmOutputParser.java b/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/job/SlurmOutputParser.java index 69b64c0..3b9d2c3 100644 --- a/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/job/SlurmOutputParser.java +++ b/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/job/SlurmOutputParser.java @@ -20,6 +20,7 @@ */ package org.apache.airavata.gsi.ssh.api.job; +import org.apache.airavata.gsi.ssh.api.SSHApiException; import org.apache.airavata.gsi.ssh.impl.JobStatus; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -29,7 +30,8 @@ import java.util.Map; public class SlurmOutputParser implements OutputParser { private static final Logger log = LoggerFactory.getLogger(PBSOutputParser.class); - public void parse(JobDescriptor descriptor, String rawOutput) { + + public void parse(JobDescriptor descriptor, String rawOutput)throws SSHApiException { log.debug(rawOutput); String[] info = rawOutput.split("\n"); String lastString = info[info.length -1]; @@ -89,7 +91,7 @@ public class SlurmOutputParser implements OutputParser { * @param rawOutput * @return */ - public String parse(String rawOutput) { + public String parse(String rawOutput) throws SSHApiException { log.debug(rawOutput); String[] info = rawOutput.split("\n"); for (String anInfo : info) { @@ -98,10 +100,10 @@ public class SlurmOutputParser implements OutputParser { return split[1].trim(); } } - return null; //To change body of implemented methods use File | Settings | File Templates. + throw new SSHApiException(rawOutput); //To change body of implemented methods use File | Settings | File Templates. } - public JobStatus parse(String jobID, String rawOutput) { + public JobStatus parse(String jobID, String rawOutput)throws SSHApiException { log.debug(rawOutput); String[] info = rawOutput.split("\n"); String lastString = info[info.length -1]; @@ -143,7 +145,7 @@ public class SlurmOutputParser implements OutputParser { return JobStatus.valueOf("U"); } - public void parse(Map<String, JobStatus> statusMap, String rawOutput) { + public void parse(Map<String, JobStatus> statusMap, String rawOutput)throws SSHApiException { //To change body of implemented methods use File | Settings | File Templates. } } http://git-wip-us.apache.org/repos/asf/airavata/blob/367a0ff2/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/impl/GSISSHAbstractCluster.java ---------------------------------------------------------------------- diff --git a/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/impl/GSISSHAbstractCluster.java b/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/impl/GSISSHAbstractCluster.java index c6866c0..d589c93 100644 --- a/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/impl/GSISSHAbstractCluster.java +++ b/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/impl/GSISSHAbstractCluster.java @@ -211,7 +211,6 @@ public class GSISSHAbstractCluster implements Cluster { " connecting user name - " + serverInfo.getUserName(), e); } - System.out.println(session.isConnected()); } public JobDescriptor cancelJob(String jobID) throws SSHApiException {
