Author: hairong
Date: Thu Dec 18 17:12:38 2008
New Revision: 727877
URL: http://svn.apache.org/viewvc?rev=727877&view=rev
Log:
Merge -r 727868:727869 from trunk to move the change log of HADOOP-4840 into
branch 0.20.
Modified:
hadoop/core/branches/branch-0.20/ (props changed)
hadoop/core/branches/branch-0.20/CHANGES.txt (contents, props changed)
hadoop/core/branches/branch-0.20/src/test/org/apache/hadoop/hdfs/server/namenode/TestNodeCount.java
Propchange: hadoop/core/branches/branch-0.20/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 18 17:12:38 2008
@@ -1,2 +1,2 @@
/hadoop/core/branches/branch-0.19:713112
-/hadoop/core/trunk:727001,727191,727228,727255
+/hadoop/core/trunk:727001,727191,727217,727228,727255,727869
Modified: hadoop/core/branches/branch-0.20/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/CHANGES.txt?rev=727877&r1=727876&r2=727877&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.20/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.20/CHANGES.txt Thu Dec 18 17:12:38 2008
@@ -1555,6 +1555,9 @@
HADOOP-4797. Improve how RPC server reads and writes large buffers. Avoids
soft-leak of direct buffers and excess copies in NIO layer. (Raghu Angadi)
+ HADOOP-4840. TestNodeCount sometimes fails with NullPointerException.
+ (hairong)
+
Release 0.18.2 - 2008-11-03
BUG FIXES
Propchange: hadoop/core/branches/branch-0.20/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 18 17:12:38 2008
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.18/CHANGES.txt:727226
/hadoop/core/branches/branch-0.19/CHANGES.txt:713112
-/hadoop/core/trunk/CHANGES.txt:727001,727191,727228,727255
+/hadoop/core/trunk/CHANGES.txt:727001,727191,727228,727255,727869
Modified:
hadoop/core/branches/branch-0.20/src/test/org/apache/hadoop/hdfs/server/namenode/TestNodeCount.java
URL:
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/src/test/org/apache/hadoop/hdfs/server/namenode/TestNodeCount.java?rev=727877&r1=727876&r2=727877&view=diff
==============================================================================
---
hadoop/core/branches/branch-0.20/src/test/org/apache/hadoop/hdfs/server/namenode/TestNodeCount.java
(original)
+++
hadoop/core/branches/branch-0.20/src/test/org/apache/hadoop/hdfs/server/namenode/TestNodeCount.java
Thu Dec 18 17:12:38 2008
@@ -61,7 +61,9 @@
// check if excessive replica is detected
NumberReplicas num = null;
do {
- num = namesystem.countNodes(block);
+ synchronized (namesystem) {
+ num = namesystem.countNodes(block);
+ }
} while (num.excessReplicas() == 0);
// find out a non-excess node
