You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2017/05/09 17:12:51 UTC
[1/3] airavata git commit: LSF job id parsing checks if there is job
id before parsing
Repository: airavata
Updated Branches:
refs/heads/develop 44f9493e6 -> a1c3e83eb
LSF job id parsing checks if there is job id before parsing
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/9ef08205
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/9ef08205
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/9ef08205
Branch: refs/heads/develop
Commit: 9ef08205c1f030b9252177c2076b310a16f1764c
Parents: 31a6705
Author: Marcus Christie <ma...@apache.org>
Authored: Tue May 9 12:39:59 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Tue May 9 12:39:59 2017 -0400
----------------------------------------------------------------------
.../org/apache/airavata/gfac/core/cluster/OutputParser.java | 2 +-
.../org/apache/airavata/gfac/impl/job/LSFOutputParser.java | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/9ef08205/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cluster/OutputParser.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cluster/OutputParser.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cluster/OutputParser.java
index abe1805..59cf94d 100644
--- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cluster/OutputParser.java
+++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cluster/OutputParser.java
@@ -30,7 +30,7 @@ public interface OutputParser {
/**
* This can be used to parseSingleJob the result of a job submission to get the JobID
* @param rawOutput
- * @return
+ * @return the job id as a String, or null if no job id found
*/
public String parseJobSubmission(String rawOutput)throws GFacException;
http://git-wip-us.apache.org/repos/asf/airavata/blob/9ef08205/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/job/LSFOutputParser.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/job/LSFOutputParser.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/job/LSFOutputParser.java
index 0a82091..aab20b8 100644
--- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/job/LSFOutputParser.java
+++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/job/LSFOutputParser.java
@@ -40,7 +40,11 @@ public class LSFOutputParser implements OutputParser {
@Override
public String parseJobSubmission(String rawOutput) throws GFacException {
logger.debug(rawOutput);
- return rawOutput.substring(rawOutput.indexOf("<")+1,rawOutput.indexOf(">"));
+ if (rawOutput.indexOf("<") >= 0) {
+ return rawOutput.substring(rawOutput.indexOf("<")+1,rawOutput.indexOf(">"));
+ } else {
+ return null;
+ }
}
@Override
[2/3] airavata git commit: Fix LSF walltime calculation when taken
from JobSubmissionTaskModel
Posted by ma...@apache.org.
Fix LSF walltime calculation when taken from JobSubmissionTaskModel
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/7b48f151
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/7b48f151
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/7b48f151
Branch: refs/heads/develop
Commit: 7b48f15144022a9dba850d1e9ad77ff098efe8f3
Parents: 9ef0820
Author: Marcus Christie <ma...@apache.org>
Authored: Tue May 9 13:10:14 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Tue May 9 13:10:14 2017 -0400
----------------------------------------------------------------------
.../src/main/java/org/apache/airavata/gfac/core/GFacUtils.java | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/7b48f151/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java
index 19a94d6..358d6a1 100644
--- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java
+++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java
@@ -522,6 +522,12 @@ public class GFacUtils {
if (jobSubmissionTaskModel.getWallTime() > 0) {
groovyMap.add(Script.MAX_WALL_TIME,
GFacUtils.maxWallTimeCalculator(jobSubmissionTaskModel.getWallTime()));
+ if (resourceJobManager != null) {
+ if (resourceJobManager.getResourceJobManagerType().equals(ResourceJobManagerType.LSF)) {
+ groovyMap.add(Script.MAX_WALL_TIME,
+ GFacUtils.maxWallTimeCalculatorForLSF(jobSubmissionTaskModel.getWallTime()));
+ }
+ }
}
} catch (TException e) {
log.error("Error while getting job submission sub task model", e);
[3/3] airavata git commit: Merge branch 'lsf-walltime' into develop
Posted by ma...@apache.org.
Merge branch 'lsf-walltime' into develop
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/a1c3e83e
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/a1c3e83e
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/a1c3e83e
Branch: refs/heads/develop
Commit: a1c3e83eb63774d2d33c3ff84dabda44ebc8935e
Parents: 44f9493 7b48f15
Author: Marcus Christie <ma...@apache.org>
Authored: Tue May 9 13:11:07 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Tue May 9 13:11:07 2017 -0400
----------------------------------------------------------------------
.../src/main/java/org/apache/airavata/gfac/core/GFacUtils.java | 6 ++++++
.../org/apache/airavata/gfac/core/cluster/OutputParser.java | 2 +-
.../org/apache/airavata/gfac/impl/job/LSFOutputParser.java | 6 +++++-
3 files changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------