You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by om...@apache.org on 2011/03/04 04:24:55 UTC
svn commit: r1076947 -
/hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/LinuxTaskController.java
Author: omalley
Date: Fri Mar 4 03:24:55 2011
New Revision: 1076947
URL: http://svn.apache.org/viewvc?rev=1076947&view=rev
Log:
commit 26f6a6644b830b65d4899f6a7dba63c6fc4ac307
Author: Lee Tucker <lt...@yahoo-inc.com>
Date: Thu Jul 30 17:40:31 2009 -0700
Applying patch 2793428.5980.patch
Modified:
hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/LinuxTaskController.java
Modified: hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/LinuxTaskController.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/LinuxTaskController.java?rev=1076947&r1=1076946&r2=1076947&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/LinuxTaskController.java (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/LinuxTaskController.java Fri Mar 4 03:24:55 2011
@@ -24,6 +24,8 @@ import java.io.IOException;
import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.List;
+import java.util.Set;
+import java.util.Map.Entry;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -125,10 +127,19 @@ class LinuxTaskController extends TaskCo
String cmdLine =
TaskLog.buildCommandLine(env.setup, env.vargs, env.stdout, env.stderr,
env.logSize, env.pidFile);
+ StringBuffer sb = new StringBuffer();
+ //export out all the environment variable before child command.
+ for(Entry<String, String> entry : env.env.entrySet()) {
+ sb.append("export ");
+ sb.append(entry.getKey());
+ sb.append("=");
+ sb.append(entry.getValue());
+ sb.append("\n");
+ }
+ sb.append(cmdLine);
// write the command to a file in the
// task specific cache directory
- writeCommand(cmdLine, getTaskCacheDirectory(context));
-
+ writeCommand(sb.toString(), getTaskCacheDirectory(context));
// Call the taskcontroller with the right parameters.
List<String> launchTaskJVMArgs = buildTaskCommandArgs(context);
ShellCommandExecutor shExec = buildTaskControllerExecutor(