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 ha...@apache.org on 2008/12/19 02:01:16 UTC

svn commit: r727875 - in /hadoop/core/branches/branch-0.18: CHANGES.txt src/test/org/apache/hadoop/dfs/TestNodeCount.java

Author: hairong
Date: Thu Dec 18 17:01:15 2008
New Revision: 727875

URL: http://svn.apache.org/viewvc?rev=727875&view=rev
Log:
Merge -r 727868:727869 from trunk to move the change log of HADOOP-4840 into section 0.18.3.

Modified:
    hadoop/core/branches/branch-0.18/CHANGES.txt
    hadoop/core/branches/branch-0.18/src/test/org/apache/hadoop/dfs/TestNodeCount.java

Modified: hadoop/core/branches/branch-0.18/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.18/CHANGES.txt?rev=727875&r1=727874&r2=727875&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.18/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.18/CHANGES.txt Thu Dec 18 17:01:15 2008
@@ -110,6 +110,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

Modified: hadoop/core/branches/branch-0.18/src/test/org/apache/hadoop/dfs/TestNodeCount.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.18/src/test/org/apache/hadoop/dfs/TestNodeCount.java?rev=727875&r1=727874&r2=727875&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.18/src/test/org/apache/hadoop/dfs/TestNodeCount.java (original)
+++ hadoop/core/branches/branch-0.18/src/test/org/apache/hadoop/dfs/TestNodeCount.java Thu Dec 18 17:01:15 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