You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sm...@apache.org on 2017/04/03 09:50:14 UTC
[1/4] airavata git commit: fixing LSFEmail parser
Repository: airavata
Updated Branches:
refs/heads/develop de5692c52 -> 5100c07db
fixing LSFEmail parser
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/5ba6a6da
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/5ba6a6da
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/5ba6a6da
Branch: refs/heads/develop
Commit: 5ba6a6da5783db888c148755393fc0ad589d6cca
Parents: 6fcd394
Author: scnakandala <su...@gmail.com>
Authored: Fri Feb 10 14:44:52 2017 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Fri Feb 10 14:44:52 2017 -0500
----------------------------------------------------------------------
.../monitor/email/parser/LSFEmailParser.java | 37 +++++++++++---------
1 file changed, 20 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/5ba6a6da/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/monitor/email/parser/LSFEmailParser.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/monitor/email/parser/LSFEmailParser.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/monitor/email/parser/LSFEmailParser.java
index d6e396e..17aefd9 100644
--- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/monitor/email/parser/LSFEmailParser.java
+++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/monitor/email/parser/LSFEmailParser.java
@@ -35,41 +35,44 @@ import java.util.regex.Pattern;
public class LSFEmailParser implements EmailParser {
private static final Logger log = LoggerFactory.getLogger(LSFEmailParser.class);
- //root@c312-206.ls4.tacc.utexas.edu
- private static final String SIGNAL = "signal";
- private static final String LONESTAR_REGEX = "Job (?<" + JOBID + ">\\d+) \\(.*\\) (?<" + STATUS
- + ">.*)\\s[a-zA-Z =]+(?<" + EXIT_STATUS + ">\\d+)\\sSignal[ ]*=[ ]*(?<" + SIGNAL + ">[a-zA-z]*)";
+ private static final String REGEX = "[a-zA-Z]+\\s+(?<" + JOBID + ">[\\d]+):\\s+<(?<" + JOBNAME + ">[a-zA-Z0-9]+)>\\s+(?<" + STATUS + ">[a-zA-Z]+)";
+ public static final String STARTED = "started";
+ public static final String COMPLETE = "Exited";
@Override
public JobStatusResult parseEmail(Message message) throws MessagingException, AiravataException {
JobStatusResult jobStatusResult = new JobStatusResult();
+
+ parseContent(message, jobStatusResult);
+ return jobStatusResult;
+ }
+
+ private void parseContent(Message message, JobStatusResult jobStatusResult) throws MessagingException, AiravataException {
+ String subject = message.getSubject();
+ Pattern pattern = Pattern.compile(REGEX);
+ Matcher matcher = pattern.matcher(subject);
try {
- String content = ((String) message.getContent());
- Pattern pattern = Pattern.compile(LONESTAR_REGEX);
- Matcher matcher = pattern.matcher(content);
if (matcher.find()) {
jobStatusResult.setJobId(matcher.group(JOBID));
- String status = matcher.group(STATUS);
- jobStatusResult.setState(getJobState(status, content));
- return jobStatusResult;
+ jobStatusResult.setJobName(matcher.group(JOBNAME));
+ String content = (String) message.getContent();
+ jobStatusResult.setState(getJobState(matcher.group(STATUS), content));
} else {
- log.error("[EJM]: No matched found for content => \n" + content);
+ log.error("[EJM]: No matched found for subject => \n" + subject);
}
} catch (IOException e) {
- throw new AiravataException("i[EJM]: Error while reading content of the email message");
+ throw new AiravataException("[EJM]: Error while reading content of the email message");
}
- return jobStatusResult;
}
private JobState getJobState(String status, String content) {
switch (status) {
- case "Aborted":
- return JobState.FAILED;
- case "Success":
+ case STARTED:
+ return JobState.ACTIVE;
+ case COMPLETE:
return JobState.COMPLETE;
default:
return JobState.UNKNOWN;
}
-
}
}
[3/4] airavata git commit: change Cancel status in UGEEmailParser
Posted by sm...@apache.org.
change Cancel status in UGEEmailParser
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/9526e99b
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/9526e99b
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/9526e99b
Branch: refs/heads/develop
Commit: 9526e99b2aed47f4ab354ad3f8a1822db4f94627
Parents: 8d2581a
Author: scnakandala <su...@gmail.com>
Authored: Wed Feb 22 14:27:56 2017 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Wed Feb 22 14:27:56 2017 -0500
----------------------------------------------------------------------
.../apache/airavata/gfac/monitor/email/parser/UGEEmailParser.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/9526e99b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/monitor/email/parser/UGEEmailParser.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/monitor/email/parser/UGEEmailParser.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/monitor/email/parser/UGEEmailParser.java
index 266456e..59ee8bf 100644
--- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/monitor/email/parser/UGEEmailParser.java
+++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/monitor/email/parser/UGEEmailParser.java
@@ -82,7 +82,7 @@ public class UGEEmailParser implements EmailParser {
case FAILED:
return JobState.FAILED;
case ABORTED:
- return JobState.FAILED;
+ return JobState.CANCELED;
default:
return JobState.UNKNOWN;
[2/4] airavata git commit: adding Done state for LSF email parsing
Posted by sm...@apache.org.
adding Done state for LSF email parsing
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/8d2581af
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/8d2581af
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/8d2581af
Branch: refs/heads/develop
Commit: 8d2581aff4e72e3cf2d353eb1b295038a5d6391b
Parents: 5ba6a6d
Author: scnakandala <su...@gmail.com>
Authored: Tue Feb 14 14:04:09 2017 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Tue Feb 14 14:04:57 2017 -0500
----------------------------------------------------------------------
.../airavata/gfac/monitor/email/parser/LSFEmailParser.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/8d2581af/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/monitor/email/parser/LSFEmailParser.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/monitor/email/parser/LSFEmailParser.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/monitor/email/parser/LSFEmailParser.java
index 17aefd9..fe4ccc3 100644
--- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/monitor/email/parser/LSFEmailParser.java
+++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/monitor/email/parser/LSFEmailParser.java
@@ -37,7 +37,8 @@ public class LSFEmailParser implements EmailParser {
private static final Logger log = LoggerFactory.getLogger(LSFEmailParser.class);
private static final String REGEX = "[a-zA-Z]+\\s+(?<" + JOBID + ">[\\d]+):\\s+<(?<" + JOBNAME + ">[a-zA-Z0-9]+)>\\s+(?<" + STATUS + ">[a-zA-Z]+)";
public static final String STARTED = "started";
- public static final String COMPLETE = "Exited";
+ public static final String COMPLETE = "Done";
+ public static final String FAILED = "Exited";
@Override
public JobStatusResult parseEmail(Message message) throws MessagingException, AiravataException {
@@ -71,6 +72,8 @@ public class LSFEmailParser implements EmailParser {
return JobState.ACTIVE;
case COMPLETE:
return JobState.COMPLETE;
+ case FAILED:
+ return JobState.FAILED;
default:
return JobState.UNKNOWN;
}
[4/4] airavata git commit: merging master
Posted by sm...@apache.org.
merging master
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/5100c07d
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/5100c07d
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/5100c07d
Branch: refs/heads/develop
Commit: 5100c07dbb4a40fd87337d3dc68380f851efe2b3
Parents: de5692c 9526e99
Author: Suresh Marru <sm...@apache.org>
Authored: Mon Apr 3 05:50:05 2017 -0400
Committer: Suresh Marru <sm...@apache.org>
Committed: Mon Apr 3 05:50:05 2017 -0400
----------------------------------------------------------------------
.../apache/airavata/gfac/monitor/email/parser/LSFEmailParser.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------