svn commit: r708710 - in /hadoop/core/trunk: CHANGES.txt src/hdfs/org/apache/hadoop/hdfs/server/namenode/NamenodeFsck.java

[ha...@apache.org]

Author: hairong
Date: Tue Oct 28 15:50:54 2008
New Revision: 708710

URL: http://svn.apache.org/viewvc?rev=708710&view=rev
Log:
HADOOP-4526. fsck failing with NullPointerException. Contributed by Hairong Kuang.

Modified:
    hadoop/core/trunk/CHANGES.txt
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/NamenodeFsck.java

Modified: hadoop/core/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=708710&r1=708709&r2=708710&view=diff
==============================================================================
--- hadoop/core/trunk/CHANGES.txt (original)
+++ hadoop/core/trunk/CHANGES.txt Tue Oct 28 15:50:54 2008
@@ -1052,7 +1052,7 @@
     HADOOP-4314. Simulated datanodes should not include blocks that are still
     being written in their block report. (Raghu Angadi)
 
-    HADOOP-4228. dfs datanoe metrics, bytes_read and bytes_written, overflow
+    HADOOP-4228. dfs datanode metrics, bytes_read and bytes_written, overflow
     due to incorrect type used. (hairong)
 
     HADOOP-4395. The FSEditLog loading is incorrect for the case OP_SET_OWNER.
@@ -1072,7 +1072,7 @@
     HADOOP-4469. Rename and add the ant task jar file to the tar file. (nigel)
 
     HADOOP-3914. DFSClient sends Checksum Ok only once for a block. 
-    (Christain Kunz via hairong)
+    (Christian Kunz via hairong)
  
     HADOOP-4467. SerializationFactory now uses the current context ClassLoader
     allowing for user supplied Serialization instances. (Chris Wensel via
@@ -1081,6 +1081,8 @@
     HADOOP-4517. Release FSDataset lock before joining ongoing create threads.
     (szetszwo)
  
+    HADOOP-4526. fsck failing with NullPointerException. (hairong)
+
   NEW FEATURES
 
     HADOOP-2421.  Add jdiff output to documentation, listing all API

Modified: hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/NamenodeFsck.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/NamenodeFsck.java?rev=708710&r1=708709&r2=708710&view=diff
==============================================================================
--- hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/NamenodeFsck.java (original)
+++ hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/NamenodeFsck.java Tue Oct 28 15:50:54 2008
@@ -172,6 +172,9 @@
     }
     long fileLen = file.getLen();
     LocatedBlocks blocks = nn.namesystem.getBlockLocations(path, 0, fileLen);
+    if (blocks == null) { // the file is deleted
+      return;
+    }
     isOpen = blocks.isUnderConstruction();
     if (isOpen && !showOpenFiles) {
       // We collect these stats about open files to report with default options