svn commit: r1186364 - in /hadoop/common/branches/branch-0.20-security/src: hdfs/org/apache/hadoop/hdfs/server/datanode/FSDataset.java test/org/apache/hadoop/hdfs/server/datanode/SimulatedFSDataset.java

[eli]

Author: eli
Date: Wed Oct 19 17:38:02 2011
New Revision: 1186364

URL: http://svn.apache.org/viewvc?rev=1186364&view=rev
Log:
HDFS-1779. Fix tests when run with append enabled.

Modified:
    
hadoop/common/branches/branch-0.20-security/src/hdfs/org/apache/hadoop/hdfs/server/datanode/FSDataset.java
    
hadoop/common/branches/branch-0.20-security/src/test/org/apache/hadoop/hdfs/server/datanode/SimulatedFSDataset.java

Modified: 
hadoop/common/branches/branch-0.20-security/src/hdfs/org/apache/hadoop/hdfs/server/datanode/FSDataset.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/src/hdfs/org/apache/hadoop/hdfs/server/datanode/FSDataset.java?rev=1186364&r1=1186363&r2=1186364&view=diff
==============================================================================
--- 
hadoop/common/branches/branch-0.20-security/src/hdfs/org/apache/hadoop/hdfs/server/datanode/FSDataset.java
 (original)
+++ 
hadoop/common/branches/branch-0.20-security/src/hdfs/org/apache/hadoop/hdfs/server/datanode/FSDataset.java
 Wed Oct 19 17:38:02 2011
@@ -563,9 +563,7 @@ public class FSDataset implements FSCons
     /**
      * Recover blocks that were being written when the datanode
      * was earlier shut down. These blocks get re-inserted into
-     * ongoingCreates. Also, send a blockreceived message to the NN
-     * for each of these blocks because these are not part of a 
-     * block report.
+     * ongoingCreates.
      */
     private void recoverBlocksBeingWritten(File bbw) throws IOException {
       FSDir fsd = new FSDir(bbw);

Modified: 
hadoop/common/branches/branch-0.20-security/src/test/org/apache/hadoop/hdfs/server/datanode/SimulatedFSDataset.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/src/test/org/apache/hadoop/hdfs/server/datanode/SimulatedFSDataset.java?rev=1186364&r1=1186363&r2=1186364&view=diff
==============================================================================
--- 
hadoop/common/branches/branch-0.20-security/src/test/org/apache/hadoop/hdfs/server/datanode/SimulatedFSDataset.java
 (original)
+++ 
hadoop/common/branches/branch-0.20-security/src/test/org/apache/hadoop/hdfs/server/datanode/SimulatedFSDataset.java
 Wed Oct 19 17:38:02 2011
@@ -686,7 +686,7 @@ public class SimulatedFSDataset  impleme
 
   @Override
   public Block[] getBlocksBeingWrittenReport() {
-    return null;
+    return new Block[0];
   }
 
   @Override