Repository: airavata Updated Branches: refs/heads/master 36158985c -> 667343064
handling another errornoues scenario Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/66734306 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/66734306 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/66734306 Branch: refs/heads/master Commit: 667343064f8a22f5d4ab562482643accd39e4759 Parents: 3615898 Author: lahiru <[email protected]> Authored: Thu Oct 2 23:35:16 2014 -0400 Committer: lahiru <[email protected]> Committed: Thu Oct 2 23:35:16 2014 -0400 ---------------------------------------------------------------------- .../org/apache/airavata/gsi/ssh/api/job/SlurmOutputParser.java | 2 +- .../org/apache/airavata/gsi/ssh/impl/GSISSHAbstractCluster.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/66734306/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 7a64871..54135c5 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 @@ -31,7 +31,7 @@ import java.util.List; import java.util.Map; public class SlurmOutputParser implements OutputParser { - private static final Logger log = LoggerFactory.getLogger(PBSOutputParser.class); + private static final Logger log = LoggerFactory.getLogger(SlurmOutputParser.class); public void parse(JobDescriptor descriptor, String rawOutput) throws SSHApiException { log.info(rawOutput); http://git-wip-us.apache.org/repos/asf/airavata/blob/66734306/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 3d6e630..0ccfd13 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 @@ -592,6 +592,8 @@ public class GSISSHAbstractCluster implements Cluster { if (stdErrorString != null && stdErrorString.contains(command) && !stdErrorString.contains("Warning")) { log.error("Standard Error output : " + stdErrorString); throw new SSHApiException(errorMsg + "\n\r StandardOutput: "+ stdOutputString + "\n\r StandardError: "+ stdErrorString); + }else if(stdOutputString.contains("error")){ + throw new SSHApiException(errorMsg + "\n\r StandardOutput: "+ stdOutputString + "\n\r StandardError: "+ stdErrorString); } return stdOutputString; }
