hadoop-hdfs-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sur...@apache.org
Subject svn commit: r1074775 - in /hadoop/hdfs/branches/HDFS-1052: CHANGES.txt src/test/hdfs/org/apache/hadoop/hdfs/TestDatanodeBlockScanner.java src/test/hdfs/org/apache/hadoop/hdfs/TestReplication.java
Date Sat, 26 Feb 2011 01:42:02 GMT
Author: suresh
Date: Sat Feb 26 01:42:01 2011
New Revision: 1074775

URL: http://svn.apache.org/viewvc?rev=1074775&view=rev
Log:
HDFS-1650. TestReplication fails. Contribued by Tanping Wang.


Modified:
    hadoop/hdfs/branches/HDFS-1052/CHANGES.txt
    hadoop/hdfs/branches/HDFS-1052/src/test/hdfs/org/apache/hadoop/hdfs/TestDatanodeBlockScanner.java
    hadoop/hdfs/branches/HDFS-1052/src/test/hdfs/org/apache/hadoop/hdfs/TestReplication.java

Modified: hadoop/hdfs/branches/HDFS-1052/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/HDFS-1052/CHANGES.txt?rev=1074775&r1=1074774&r2=1074775&view=diff
==============================================================================
--- hadoop/hdfs/branches/HDFS-1052/CHANGES.txt (original)
+++ hadoop/hdfs/branches/HDFS-1052/CHANGES.txt Sat Feb 26 01:42:01 2011
@@ -5,7 +5,7 @@ Trunk (unreleased changes)
   NEW FEATURES
 
     HDFS-1365. Federation: propose ClusterID and BlockPoolID format 
-    (tanping via boryas)
+    (Tanping via boryas)
 
     HDFS-1394. Federation: modify -format option for namenode to generated 
     new blockpool id and accept newcluster (boryas)
@@ -14,13 +14,13 @@ Trunk (unreleased changes)
     include BlockPoolID in the protocol. (suresh)
 
     HDFS-1428. Federation : add cluster ID and block pool ID into 
-    Name node web UI(tanping via boryas)
+    Name node web UI(Tanping via boryas)
 
     HDFS-1450. Federation: Introduce block pool ID into FSDatasetInterface.
     (suresh)
 
     HDFS-1632. Federation: data node storage structure changes and
-    introduce block pool storage. (tanping via suresh)
+    introduce block pool storage. (Tanping via suresh)
 
     HDFS-1634. Federation: Convert single threaded DataNode into 
     per BlockPool thread model.(boryas)
@@ -42,7 +42,7 @@ Trunk (unreleased changes)
     HDFS-1639. Add block pool management to FSDataset. (suresh)
 
     HDFS-1648. Only DataStorage must be locked using in_use.lock and no 
-    locks must be associated with BlockPoolStorage. (tanping via suresh)
+    locks must be associated with BlockPoolStorage. (Tanping via suresh)
 
     HDFS-1641. Datanode fields that are no longer used should be removed (boryas)
 
@@ -61,6 +61,8 @@ Trunk (unreleased changes)
     HDFS-1660. HDFS Federation: Datanode doesn't start with two namenodes
     (boryas)
 
+    HDFS-1650. TestReplication fails. (Tanping via suresh)
+
   IMPROVEMENTS
 
     HDFS-1510. Added test-patch.properties required by test-patch.sh (nigel)

Modified: hadoop/hdfs/branches/HDFS-1052/src/test/hdfs/org/apache/hadoop/hdfs/TestDatanodeBlockScanner.java
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/HDFS-1052/src/test/hdfs/org/apache/hadoop/hdfs/TestDatanodeBlockScanner.java?rev=1074775&r1=1074774&r2=1074775&view=diff
==============================================================================
--- hadoop/hdfs/branches/HDFS-1052/src/test/hdfs/org/apache/hadoop/hdfs/TestDatanodeBlockScanner.java
(original)
+++ hadoop/hdfs/branches/HDFS-1052/src/test/hdfs/org/apache/hadoop/hdfs/TestDatanodeBlockScanner.java
Sat Feb 26 01:42:01 2011
@@ -408,7 +408,7 @@ public class TestDatanodeBlockScanner ex
   static boolean changeReplicaLength(ExtendedBlock blk, int dnIndex,
       int lenDelta) throws IOException {
     File blockFile = MiniDFSCluster.getBlockFile(dnIndex, blk);
-    if (blockFile.exists()) {
+    if (blockFile != null && blockFile.exists()) {
       RandomAccessFile raFile = new RandomAccessFile(blockFile, "rw");
       raFile.setLength(raFile.length()+lenDelta);
       raFile.close();

Modified: hadoop/hdfs/branches/HDFS-1052/src/test/hdfs/org/apache/hadoop/hdfs/TestReplication.java
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/HDFS-1052/src/test/hdfs/org/apache/hadoop/hdfs/TestReplication.java?rev=1074775&r1=1074774&r2=1074775&view=diff
==============================================================================
--- hadoop/hdfs/branches/HDFS-1052/src/test/hdfs/org/apache/hadoop/hdfs/TestReplication.java
(original)
+++ hadoop/hdfs/branches/HDFS-1052/src/test/hdfs/org/apache/hadoop/hdfs/TestReplication.java
Sat Feb 26 01:42:01 2011
@@ -337,8 +337,9 @@ public class TestReplication extends Tes
       }
       
       int fileCount = 0;
-      for (int i=0; i<6; i++) {
-        File blockFile = MiniDFSCluster.getBlockFile(i, block);
+      // Choose 3 copies of block file - delete 1 and corrupt the remaining 2
+      for (int dnIndex=0; dnIndex<3; dnIndex++) {
+        File blockFile = MiniDFSCluster.getBlockFile(dnIndex, block);
         LOG.info("Checking for file " + blockFile);
         
         if (blockFile.exists()) {



Mime
View raw message