You are viewing a plain text version of this content. The canonical link for it is here.
Posted to mapreduce-commits@hadoop.apache.org by ey...@apache.org on 2011/10/04 02:51:14 UTC

svn commit: r1178657 - in /hadoop/common/trunk/hadoop-mapreduce-project: CHANGES.txt src/contrib/streaming/src/java/org/apache/hadoop/streaming/StreamJob.java

Author: eyang
Date: Tue Oct  4 00:51:13 2011
New Revision: 1178657

URL: http://svn.apache.org/viewvc?rev=1178657&view=rev
Log:
MAPREDUCE-3112. Fixed recursive sourcing of HADOOP_OPTS environment
variable. (Eric Yang)

Modified:
    hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt
    hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/streaming/src/java/org/apache/hadoop/streaming/StreamJob.java

Modified: hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt?rev=1178657&r1=1178656&r2=1178657&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt Tue Oct  4 00:51:13 2011
@@ -1507,6 +1507,9 @@ Release 0.23.0 - Unreleased
     MAPREDUCE-2792. Replace usage of node ip-addresses with hostnames.
     (vinodkv via acmurthy) 
 
+    MAPREDUCE-3112. Fixed recursive sourcing of HADOOP_OPTS environment
+    variable. (Eric Yang)
+
 Release 0.22.0 - Unreleased
 
   INCOMPATIBLE CHANGES

Modified: hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/streaming/src/java/org/apache/hadoop/streaming/StreamJob.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/streaming/src/java/org/apache/hadoop/streaming/StreamJob.java?rev=1178657&r1=1178656&r2=1178657&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/streaming/src/java/org/apache/hadoop/streaming/StreamJob.java (original)
+++ hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/streaming/src/java/org/apache/hadoop/streaming/StreamJob.java Tue Oct  4 00:51:13 2011
@@ -180,7 +180,9 @@ public class StreamJob implements Tool {
 
   void preProcessArgs() {
     verbose_ = false;
-    addTaskEnvironment_ = "";
+    // Unset HADOOP_ROOT_LOGGER in case streaming job
+    // invokes additional hadoop commands.
+    addTaskEnvironment_ = "HADOOP_ROOT_LOGGER=";
   }
 
   void postProcessArgs() throws IOException {