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/registry-refactoring Commit: 7b48f15144022a9dba850d1e9ad77ff098efe8f3 Parents: 9ef0820 Author: Marcus Christie <[email protected]> Authored: Tue May 9 13:10:14 2017 -0400 Committer: Marcus Christie <[email protected]> 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);
