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/13 18:03:23 UTC
airavata git commit: Fixed job name output length issue in JobId
verify process.
Repository: airavata
Updated Branches:
refs/heads/master b96366fec -> a6a80d5ac
Fixed job name output length issue in JobId verify process.
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/a6a80d5a
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/a6a80d5a
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/a6a80d5a
Branch: refs/heads/master
Commit: a6a80d5ac827976f0c637c8adf9447b98795c7c7
Parents: b96366f
Author: shamrath <sh...@gmail.com>
Authored: Wed May 13 12:03:21 2015 -0400
Committer: shamrath <sh...@gmail.com>
Committed: Wed May 13 12:03:21 2015 -0400
----------------------------------------------------------------------
.../airavata/gsi/ssh/api/job/SlurmJobConfiguration.java | 2 +-
.../apache/airavata/gsi/ssh/api/job/SlurmOutputParser.java | 7 ++++++-
2 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/a6a80d5a/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/job/SlurmJobConfiguration.java
----------------------------------------------------------------------
diff --git a/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/job/SlurmJobConfiguration.java b/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/job/SlurmJobConfiguration.java
index a74b35d..5feed86 100644
--- a/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/job/SlurmJobConfiguration.java
+++ b/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/job/SlurmJobConfiguration.java
@@ -97,7 +97,7 @@ public class SlurmJobConfiguration implements JobManagerConfiguration{
@Override
public RawCommandInfo getJobIdMonitorCommand(String jobName, String userName) {
- return new RawCommandInfo(this.installedPath + "squeue -n " + jobName);
+ return new RawCommandInfo(this.installedPath + "squeue -n " + jobName + " -u " + userName);
}
@Override
http://git-wip-us.apache.org/repos/asf/airavata/blob/a6a80d5a/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 64691dc..b8a6b6d 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
@@ -25,7 +25,6 @@ import org.apache.airavata.gsi.ssh.impl.JobStatus;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.print.attribute.standard.JobState;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -34,6 +33,7 @@ import java.util.regex.Pattern;
public class SlurmOutputParser implements OutputParser {
private static final Logger log = LoggerFactory.getLogger(SlurmOutputParser.class);
+ public static final int JOB_NAME_OUTPUT_LENGTH = 8;
public void parseSingleJob(JobDescriptor descriptor, String rawOutput) throws SSHApiException {
log.info(rawOutput);
@@ -193,6 +193,11 @@ public class SlurmOutputParser implements OutputParser {
@Override
public String parseJobId(String jobName, String rawOutput) throws SSHApiException {
String regJobId = "jobId";
+ if (jobName == null) {
+ return null;
+ } else if(jobName.length() > JOB_NAME_OUTPUT_LENGTH) {
+ jobName = jobName.substring(0, JOB_NAME_OUTPUT_LENGTH);
+ }
Pattern pattern = Pattern.compile("(?=(?<" + regJobId + ">\\d+)\\s+\\w+\\s+" + jobName + ")"); // regex - look ahead and match
if (rawOutput != null) {
Matcher matcher = pattern.matcher(rawOutput);