date:20120927

svn commit: r1391089 - in /hadoop/common/branches/branch-1: CHANGES.txt src/mapred/org/apache/hadoop/mapred/ReduceTask.java

2012-09-27 Thread harsh

Author: harsh
Date: Thu Sep 27 16:33:51 2012
New Revision: 1391089

URL: http://svn.apache.org/viewvc?rev=1391089view=rev
Log:
MAPREDUCE-4464. Reduce tasks failing with NullPointerException in 
ConcurrentHashMap.get(). Contributed by Clint Heath. (harsh)

Modified:
hadoop/common/branches/branch-1/CHANGES.txt

hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapred/ReduceTask.java

Modified: hadoop/common/branches/branch-1/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/CHANGES.txt?rev=1391089r1=1391088r2=1391089view=diff
==
--- hadoop/common/branches/branch-1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1/CHANGES.txt Thu Sep 27 16:33:51 2012
@@ -78,6 +78,9 @@ Release 1.2.0 - unreleased
 MAPREDUCE-2770. Improve hadoop.job.history.location doc in
 mapred-default.xml. (Sandy Ryza via tomwhite)
 
+MAPREDUCE-4464. Reduce tasks failing with NullPointerException in
+ConcurrentHashMap.get(). (Clint Heath via harsh)
+
   OPTIMIZATIONS
 
 HDFS-2533. Backport: Remove needless synchronization on some FSDataSet

Modified: 
hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapred/ReduceTask.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapred/ReduceTask.java?rev=1391089r1=1391088r2=1391089view=diff
==
--- 
hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapred/ReduceTask.java
 (original)
+++ 
hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapred/ReduceTask.java
 Thu Sep 27 16:33:51 2012
@@ -2916,6 +2916,12 @@ class ReduceTask extends Task {
 {
   URI u = URI.create(event.getTaskTrackerHttp());
   String host = u.getHost();
+  if (host == null) {
+throw new IOException(Invalid hostname found in tracker +
+location: ' +
+   event.getTaskTrackerHttp() +
+   ');
+  }
   TaskAttemptID taskId = event.getTaskAttemptId();
   URL mapOutputLocation = new URL(event.getTaskTrackerHttp() + 
   /mapOutput?job= + taskId.getJobID() +

svn commit: r1391150 - /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt

2012-09-27 Thread daryn

Author: daryn
Date: Thu Sep 27 18:11:25 2012
New Revision: 1391150

URL: http://svn.apache.org/viewvc?rev=1391150view=rev
Log:
HDFS-3922. namenode throws away blocks under construction on restart (Kihwal 
Lee via daryn)

Modified:

hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt

Modified: 
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1391150r1=1391149r2=1391150view=diff
==
--- 
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
 (original)
+++ 
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
 Thu Sep 27 18:11:25 2012
@@ -224,6 +224,9 @@ Release 0.23.3 - UNRELEASED
 HADOOP-8727. Gracefully deprecate dfs.umaskmode in 2.x onwards (Harsh J
 via bobby)
 
+HDFS-3922. namenode throws away blocks under construction on restart
+(Kihwal Lee via daryn)
+
 Release 0.23.2 - UNRELEASED 
 
   NEW FEATURES

svn commit: r1391155 - /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt

2012-09-27 Thread daryn

Author: daryn
Date: Thu Sep 27 18:21:17 2012
New Revision: 1391155

URL: http://svn.apache.org/viewvc?rev=1391155view=rev
Log:
HDFS-3731. 2.0 release upgrade must handle blocks being written from 1.0 
(Kihwal Lee via daryn)

Modified:

hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt

Modified: 
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1391155r1=1391154r2=1391155view=diff
==
--- 
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
 (original)
+++ 
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
 Thu Sep 27 18:21:17 2012
@@ -224,9 +224,6 @@ Release 0.23.3 - UNRELEASED
 HADOOP-8727. Gracefully deprecate dfs.umaskmode in 2.x onwards (Harsh J
 via bobby)
 
-HDFS-3922. namenode throws away blocks under construction on restart
-(Kihwal Lee via daryn)
-
 Release 0.23.2 - UNRELEASED 
 
   NEW FEATURES

svn commit: r1391247 - /hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ExitUtil.java

2012-09-27 Thread todd

Author: todd
Date: Thu Sep 27 22:37:58 2012
New Revision: 1391247

URL: http://svn.apache.org/viewvc?rev=1391247view=rev
Log:
Fix some spurious whitespace changes in branch (per Suresh's review)

Modified:

hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ExitUtil.java

Modified: 
hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ExitUtil.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ExitUtil.java?rev=1391247r1=1391246r2=1391247view=diff
==
--- 
hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ExitUtil.java
 (original)
+++ 
hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ExitUtil.java
 Thu Sep 27 22:37:58 2012
@@ -63,7 +63,7 @@ public final class ExitUtil {
   public static ExitException getFirstExitException() {
 return firstExitException;
   }
-  
+
   /**
* Reset the tracking of process termination. This is for use
* in unit tests where one test in the suite expects an exit

svn commit: r1391276 - in /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common: CHANGES.txt src/main/bin/hadoop

2012-09-27 Thread jlowe

Author: jlowe
Date: Fri Sep 28 01:00:40 2012
New Revision: 1391276

URL: http://svn.apache.org/viewvc?rev=1391276view=rev
Log:
svn merge -c 1366126 FIXES: HADOOP-8623. hadoop jar command should respect 
HADOOP_OPTS. Contributed by Steven Willis.

Modified:

hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt

hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/bin/hadoop

Modified: 
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1391276r1=1391275r2=1391276view=diff
==
--- 
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
 (original)
+++ 
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
 Fri Sep 28 01:00:40 2012
@@ -22,6 +22,9 @@ Release 0.23.4 - UNRELEASED
 
 HADOOP-8183. Stop using mapred.used.genericoptions.parser (harsh)
 
+HADOOP-8623. hadoop jar command should respect HADOOP_OPTS.
+(Steven Willis via suresh)
+
 Release 0.23.3 - UNRELEASED
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/bin/hadoop
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/bin/hadoop?rev=1391276r1=1391275r2=1391276view=diff
==
--- 
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/bin/hadoop
 (original)
+++ 
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/bin/hadoop
 Fri Sep 28 01:00:40 2012
@@ -94,33 +94,30 @@ case $COMMAND in
 # the core commands
 if [ $COMMAND = fs ] ; then
   CLASS=org.apache.hadoop.fs.FsShell
-  HADOOP_OPTS=$HADOOP_OPTS $HADOOP_CLIENT_OPTS
 elif [ $COMMAND = version ] ; then
   CLASS=org.apache.hadoop.util.VersionInfo
-  HADOOP_OPTS=$HADOOP_OPTS $HADOOP_CLIENT_OPTS
 elif [ $COMMAND = jar ] ; then
   CLASS=org.apache.hadoop.util.RunJar
 elif [ $COMMAND = distcp ] ; then
   CLASS=org.apache.hadoop.tools.DistCp
   CLASSPATH=${CLASSPATH}:${TOOL_PATH}
-  HADOOP_OPTS=$HADOOP_OPTS $HADOOP_CLIENT_OPTS
 elif [ $COMMAND = daemonlog ] ; then
   CLASS=org.apache.hadoop.log.LogLevel
-  HADOOP_OPTS=$HADOOP_OPTS $HADOOP_CLIENT_OPTS
 elif [ $COMMAND = archive ] ; then
   CLASS=org.apache.hadoop.tools.HadoopArchives
   CLASSPATH=${CLASSPATH}:${TOOL_PATH}
-  HADOOP_OPTS=$HADOOP_OPTS $HADOOP_CLIENT_OPTS
 elif [[ $COMMAND = -*  ]] ; then
 # class and package names cannot begin with a -
 echo Error: No command named \`$COMMAND' was found. Perhaps you meant 
\`hadoop ${COMMAND#-}'
 exit 1
 else
-  HADOOP_OPTS=$HADOOP_OPTS $HADOOP_CLIENT_OPTS
   CLASS=$COMMAND
 fi
 shift
 
+# Always respect HADOOP_OPTS and HADOOP_CLIENT_OPTS
+HADOOP_OPTS=$HADOOP_OPTS $HADOOP_CLIENT_OPTS
+
 #make sure security appender is turned off
 HADOOP_OPTS=$HADOOP_OPTS 
-Dhadoop.security.logger=${HADOOP_SECURITY_LOGGER:-INFO,NullAppender}

svn commit: r1391089 - in /hadoop/common/branches/branch-1: CHANGES.txt src/mapred/org/apache/hadoop/mapred/ReduceTask.java

svn commit: r1391150 - /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt

svn commit: r1391155 - /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt

svn commit: r1391247 - /hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ExitUtil.java

svn commit: r1391276 - in /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common: CHANGES.txt src/main/bin/hadoop

5 matches

Site Navigation

Mail list logo

Footer information