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/11/04 18:47:04 UTC
airavata git commit: Fixed bug in max wall time setting
Repository: airavata
Updated Branches:
refs/heads/master ef332fcba -> be08320dd
Fixed bug in max wall time setting
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/be08320d
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/be08320d
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/be08320d
Branch: refs/heads/master
Commit: be08320dda089405ed83de6e7bed3d1ea0a16b52
Parents: ef332fc
Author: Shameera Rathnayaka <sh...@gmail.com>
Authored: Wed Nov 4 12:46:55 2015 -0500
Committer: Shameera Rathnayaka <sh...@gmail.com>
Committed: Wed Nov 4 12:46:55 2015 -0500
----------------------------------------------------------------------
.../src/main/java/org/apache/airavata/gfac/core/GFacUtils.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/be08320d/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 4c9d07d..6652504 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
@@ -551,7 +551,7 @@ public class GFacUtils {
}
// max wall time may be set before this level if jobsubmission task has wall time configured to this job,
// if so we ignore scheduling configuration.
- if (scheduling.getWallTimeLimit() > 0 && jobDescriptor.getMaxWallTime() != null) {
+ if (scheduling.getWallTimeLimit() > 0 && jobDescriptor.getMaxWallTime() == null) {
jobDescriptor.setMaxWallTime(String.valueOf(scheduling.getWallTimeLimit()));
if (resourceJobManager != null) {
if (resourceJobManager.getResourceJobManagerType().equals(ResourceJobManagerType.LSF)) {