Repository: airavata Updated Branches: refs/heads/airavata-0.15-release-branch 57de8d6b9 -> 6b0f5da17
Monitor jobs on blacklight. AIRAVATA-1716 Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/919e6d65 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/919e6d65 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/919e6d65 Branch: refs/heads/airavata-0.15-release-branch Commit: 919e6d657ca3da7954e99615a92587f7b51d7700 Parents: 58af590 Author: raminder <[email protected]> Authored: Fri Jun 5 16:49:39 2015 -0400 Committer: raminder <[email protected]> Committed: Fri Jun 5 16:49:39 2015 -0400 ---------------------------------------------------------------------- .../apache/airavata/gfac/monitor/email/EmailBasedMonitor.java | 5 ++++- .../org/apache/airavata/gsi/ssh/api/job/PBSOutputParser.java | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/919e6d65/modules/gfac/gfac-monitor/gfac-email-monitor/src/main/java/org/apache/airavata/gfac/monitor/email/EmailBasedMonitor.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-monitor/gfac-email-monitor/src/main/java/org/apache/airavata/gfac/monitor/email/EmailBasedMonitor.java b/modules/gfac/gfac-monitor/gfac-email-monitor/src/main/java/org/apache/airavata/gfac/monitor/email/EmailBasedMonitor.java index 8816ec2..fd9d536 100644 --- a/modules/gfac/gfac-monitor/gfac-email-monitor/src/main/java/org/apache/airavata/gfac/monitor/email/EmailBasedMonitor.java +++ b/modules/gfac/gfac-monitor/gfac-email-monitor/src/main/java/org/apache/airavata/gfac/monitor/email/EmailBasedMonitor.java @@ -157,7 +157,10 @@ public class EmailBasedMonitor implements Runnable{ default: if (addressStr.contains("ls4.tacc.utexas.edu>")) { // lonestar return ResourceJobManagerType.UGE; - } else { + } else if (addressStr.contains("blacklight.psc.xsede.org")){ + return ResourceJobManagerType.PBS; + } + else { throw new AiravataException("[EJM]: Couldn't identify Resource job manager type from address " + addressStr); } } http://git-wip-us.apache.org/repos/asf/airavata/blob/919e6d65/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/job/PBSOutputParser.java ---------------------------------------------------------------------- diff --git a/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/job/PBSOutputParser.java b/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/job/PBSOutputParser.java index 1458f4c..fd1d215 100644 --- a/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/job/PBSOutputParser.java +++ b/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/job/PBSOutputParser.java @@ -124,6 +124,9 @@ public class PBSOutputParser implements OutputParser { public String parseJobSubmission(String rawOutput) { log.debug(rawOutput); + if(rawOutput.contains(".")){ + rawOutput = rawOutput.substring(0, rawOutput.indexOf(".")); + } return rawOutput; //In PBS stdout is going to be directly the jobID }
