[Swift-commit] cog r3678

[swift at ci.uchicago.edu]

------------------------------------------------------------------------
r3678 | hategan | 2013-07-03 22:00:38 -0500 (Wed, 03 Jul 2013) | 1 line

also redirect when the new redirect stuff is set; log whether redirection or not is done in the worker
------------------------------------------------------------------------
Index: modules/provider-coaster/src/org/globus/cog/abstraction/impl/execution/coaster/SubmitJobCommand.java
===================================================================
--- modules/provider-coaster/src/org/globus/cog/abstraction/impl/execution/coaster/SubmitJobCommand.java	(revision 3677)
+++ modules/provider-coaster/src/org/globus/cog/abstraction/impl/execution/coaster/SubmitJobCommand.java	(working copy)
@@ -25,6 +25,7 @@
 import org.globus.cog.abstraction.coaster.service.job.manager.Settings;
 import org.globus.cog.abstraction.impl.common.execution.WallTime;
 import org.globus.cog.abstraction.interfaces.ExecutionService;
+import org.globus.cog.abstraction.interfaces.FileLocation;
 import org.globus.cog.abstraction.interfaces.JobSpecification;
 import org.globus.cog.abstraction.interfaces.Service;
 import org.globus.cog.abstraction.interfaces.StagingSetEntry;
@@ -97,7 +98,9 @@
         add(sb, "stdout", spec.getStdOutput());
         add(sb, "stderr", spec.getStdError());
         
-        if (spec.isRedirected()) {
+        if (spec.isRedirected() || 
+                spec.getStdOutputLocation().overlaps(FileLocation.MEMORY) || 
+                spec.getStdErrorLocation().overlaps(FileLocation.MEMORY)) {
             add(sb, "redirect", true);
         }
 
Index: modules/provider-coaster/resources/worker.pl
===================================================================
--- modules/provider-coaster/resources/worker.pl	(revision 3677)
+++ modules/provider-coaster/resources/worker.pl	(working copy)
@@ -1595,6 +1595,7 @@
 		$redirect = 1;
 	}
 	else {
+		wlog DEBUG, "$jobid Output is NOT redirected\n";
 		$stdoutRedir = "";
 		$stderrRedir = "";
 	}