Repository: airavata Updated Branches: refs/heads/develop a7573b2fb -> b182ca18a
fixing minor issues in local fork job submission Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/b182ca18 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/b182ca18 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/b182ca18 Branch: refs/heads/develop Commit: b182ca18a6f5e81caf97bb5e18efd863f17bdf55 Parents: a7573b2 Author: scnakandala <supun.nakand...@gmail.com> Authored: Wed Aug 9 17:23:19 2017 -0400 Committer: scnakandala <supun.nakand...@gmail.com> Committed: Wed Aug 9 17:23:19 2017 -0400 ---------------------------------------------------------------------- .../main/java/org/apache/airavata/gfac/core/GFacUtils.java | 2 +- .../org/apache/airavata/gfac/impl/LocalCommandOutput.java | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/b182ca18/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 1bb9e6f..6c4cfc8 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 @@ -850,7 +850,7 @@ public class GFacUtils { public static String getTemplateFileName(ResourceJobManagerType resourceJobManagerType) { switch (resourceJobManagerType) { case FORK: - return "UGE_Groovy.template"; + return "FORK_Groovy.template"; case PBS: return "PBS_Groovy.template"; case SLURM: http://git-wip-us.apache.org/repos/asf/airavata/blob/b182ca18/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/LocalCommandOutput.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/LocalCommandOutput.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/LocalCommandOutput.java index 709130d..d308eed 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/LocalCommandOutput.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/LocalCommandOutput.java @@ -74,6 +74,13 @@ public class LocalCommandOutput implements CommandOutput { @Override public int getExitCode() { + while (process.isAlive()){ + try { + Thread.sleep(1000); + } catch (InterruptedException e) { + e.printStackTrace(); + } + } return process.exitValue(); } }
