Return-Path: Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: (qmail 86276 invoked from network); 4 Mar 2011 03:25:17 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 4 Mar 2011 03:25:17 -0000 Received: (qmail 90678 invoked by uid 500); 4 Mar 2011 03:25:16 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 90639 invoked by uid 500); 4 Mar 2011 03:25:16 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 90629 invoked by uid 99); 4 Mar 2011 03:25:16 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Mar 2011 03:25:16 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Mar 2011 03:25:15 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 86E5A2388A36; Fri, 4 Mar 2011 03:24:55 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1076947 - /hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/LinuxTaskController.java Date: Fri, 04 Mar 2011 03:24:55 -0000 To: common-commits@hadoop.apache.org From: omalley@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110304032455.86E5A2388A36@eris.apache.org> 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 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 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 launchTaskJVMArgs = buildTaskCommandArgs(context); ShellCommandExecutor shExec = buildTaskControllerExecutor(