You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sh...@apache.org on 2015/05/27 22:18:31 UTC
[1/2] airavata git commit: UGE: qstat only show first 10 characters
of the jobName, consider this limitation in UGEOutputParser regex.
Repository: airavata
Updated Branches:
refs/heads/master e6c774b2b -> 5002df55a
UGE: qstat only show first 10 characters of the jobName, consider this limitation in UGEOutputParser regex.
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/c6081e75
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/c6081e75
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/c6081e75
Branch: refs/heads/master
Commit: c6081e75bf3ce6a462a3460e628fe7f8d847b53c
Parents: 9318831
Author: Shameera Rathanyaka <sh...@gmail.com>
Authored: Wed May 27 16:18:06 2015 -0400
Committer: Shameera Rathanyaka <sh...@gmail.com>
Committed: Wed May 27 16:18:06 2015 -0400
----------------------------------------------------------------------
.../java/org/apache/airavata/gsi/ssh/api/job/UGEOutputParser.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/c6081e75/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/job/UGEOutputParser.java
----------------------------------------------------------------------
diff --git a/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/job/UGEOutputParser.java b/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/job/UGEOutputParser.java
index 238581a..1465c4f 100644
--- a/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/job/UGEOutputParser.java
+++ b/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/job/UGEOutputParser.java
@@ -173,6 +173,9 @@ public class UGEOutputParser implements OutputParser{
@Override
public String parseJobId(String jobName, String rawOutput) throws SSHApiException {
+ if (jobName.length() > 10) {
+ jobName = jobName.substring(0, 10);
+ }
Pattern pattern = Pattern.compile("(?<" + JOB_ID + ">\\S+)\\s+\\S+\\s+(" + jobName + ")");
Matcher matcher = pattern.matcher(rawOutput);
if (matcher.find()) {
[2/2] airavata git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/airavata
Posted by sh...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/5002df55
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/5002df55
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/5002df55
Branch: refs/heads/master
Commit: 5002df55a77f1949f12f30dea5c4d1117f2648a5
Parents: c6081e7 e6c774b
Author: Shameera Rathanyaka <sh...@gmail.com>
Authored: Wed May 27 16:18:16 2015 -0400
Committer: Shameera Rathanyaka <sh...@gmail.com>
Committed: Wed May 27 16:18:16 2015 -0400
----------------------------------------------------------------------
.../messaging/core/MessagingConstants.java | 2 +-
.../validator/impl/BatchQueueValidator.java | 83 ++++++++++++++------
2 files changed, 61 insertions(+), 24 deletions(-)
----------------------------------------------------------------------