Repository: airavata Updated Branches: refs/heads/develop e4a6b18d4 -> 2e7fb05b4
Handle stdout and stderr with aurora job submission Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/2e7fb05b Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/2e7fb05b Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/2e7fb05b Branch: refs/heads/develop Commit: 2e7fb05b4ce039a4da5e7768ed6f79b3f92e5e5f Parents: e4a6b18 Author: Shameera Rathnayaka <[email protected]> Authored: Wed Nov 9 16:01:32 2016 -0500 Committer: Shameera Rathnayaka <[email protected]> Committed: Wed Nov 9 16:01:32 2016 -0500 ---------------------------------------------------------------------- .../gfac/impl/task/AuroraJobSubmissionTask.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/2e7fb05b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/AuroraJobSubmissionTask.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/AuroraJobSubmissionTask.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/AuroraJobSubmissionTask.java index 96b8187..2e55fe7 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/AuroraJobSubmissionTask.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/AuroraJobSubmissionTask.java @@ -90,11 +90,20 @@ public class AuroraJobSubmissionTask implements JobSubmissionTask{ String templateFileName = GFacUtils.getTemplateFileName(ResourceJobManagerType.CLOUD); String script = GFacUtils.generateScript(groovyMap, templateFileName); Set<ProcessBean> processes = new LinkedHashSet<>(); - ProcessBean process_1 = new ProcessBean("process_1", script, false); + ProcessBean process_1 = new ProcessBean("main_process", script, false); processes.add(process_1); - ProcessBean stdOutProcess = new ProcessBean("stdout_copy_process", "pwd", false); - processes.add(stdOutProcess); + groovyMap.getStringValue(Script.STANDARD_OUT_FILE) + .ifPresent(stdout -> { + ProcessBean stdOutProcess = new ProcessBean("stdout_copy_process", "cp .logs/main_process/0/stdout " + stdout, false); + processes.add(stdOutProcess); + }); + + groovyMap.getStringValue(Script.STANDARD_ERROR_FILE) + .ifPresent(stderr -> { + ProcessBean stdErrProcess = new ProcessBean("stderr_copy_process", "cp .logs/main_process/0/stderr " + stderr, false); + processes.add(stdErrProcess); + }); ResourceBean resources = new ResourceBean(1.5, 512, 512);
