svn commit: r1096520 - in /hadoop/mapreduce/trunk: ./ src/contrib/raid/src/test/org/apache/hadoop/raid/

[eli]

Author: eli
Date: Mon Apr 25 16:58:34 2011
New Revision: 1096520

URL: http://svn.apache.org/viewvc?rev=1096520&view=rev
Log:
MAPREDUCE-2448. NoSuchMethodError: 
org.apache.hadoop.hdfs.TestDatanodeBlockScanner.corruptReplica(..). Contributed 
by Eli Collins


Modified:
    hadoop/mapreduce/trunk/CHANGES.txt
    
hadoop/mapreduce/trunk/src/contrib/raid/src/test/org/apache/hadoop/raid/TestBlockFixer.java
    
hadoop/mapreduce/trunk/src/contrib/raid/src/test/org/apache/hadoop/raid/TestRaidShell.java
    
hadoop/mapreduce/trunk/src/contrib/raid/src/test/org/apache/hadoop/raid/TestReedSolomonDecoder.java

Modified: hadoop/mapreduce/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/CHANGES.txt?rev=1096520&r1=1096519&r2=1096520&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/CHANGES.txt (original)
+++ hadoop/mapreduce/trunk/CHANGES.txt Mon Apr 25 16:58:34 2011
@@ -130,6 +130,9 @@ Trunk (unreleased changes)
     MAPREDUCE-2426. Make TestFairSchedulerSystem fail with more verbose output
     (todd)
 
+    MAPREDUCE-2448. NoSuchMethodError:
+    org.apache.hadoop.hdfs.TestDatanodeBlockScanner.corruptReplica(..) (eli)
+
 Release 0.22.0 - Unreleased
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/mapreduce/trunk/src/contrib/raid/src/test/org/apache/hadoop/raid/TestBlockFixer.java
URL: 
http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/contrib/raid/src/test/org/apache/hadoop/raid/TestBlockFixer.java?rev=1096520&r1=1096519&r2=1096520&view=diff
==============================================================================
--- 
hadoop/mapreduce/trunk/src/contrib/raid/src/test/org/apache/hadoop/raid/TestBlockFixer.java
 (original)
+++ 
hadoop/mapreduce/trunk/src/contrib/raid/src/test/org/apache/hadoop/raid/TestBlockFixer.java
 Mon Apr 25 16:58:34 2011
@@ -637,12 +637,9 @@ public class TestBlockFixer {
     return crc.getValue();
   }
 
-  static void corruptBlock(String blockName) throws IOException {
-    boolean corrupted = false;
-    for (int i = 0; i < NUM_DATANODES; i++) {
-      corrupted |= TestDatanodeBlockScanner.corruptReplica(blockName, i);
-    }
-    assertTrue("could not corrupt block", corrupted);
+  void corruptBlock(String blockName) throws IOException {
+    assertTrue("Could not corrupt block",
+        dfs.corruptBlockOnDataNodes(blockName) > 0);
   }
   
   static void reportCorruptBlocks(FileSystem fs, Path file, int[] idxs,

Modified: 
hadoop/mapreduce/trunk/src/contrib/raid/src/test/org/apache/hadoop/raid/TestRaidShell.java
URL: 
http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/contrib/raid/src/test/org/apache/hadoop/raid/TestRaidShell.java?rev=1096520&r1=1096519&r2=1096520&view=diff
==============================================================================
--- 
hadoop/mapreduce/trunk/src/contrib/raid/src/test/org/apache/hadoop/raid/TestRaidShell.java
 (original)
+++ 
hadoop/mapreduce/trunk/src/contrib/raid/src/test/org/apache/hadoop/raid/TestRaidShell.java
 Mon Apr 25 16:58:34 2011
@@ -287,10 +287,7 @@ public class TestRaidShell extends TestC
   }
 
   void corruptBlock(String blockName) throws IOException {
-    boolean corrupted = false;
-    for (int i = 0; i < NUM_DATANODES; i++) {
-      corrupted |= TestDatanodeBlockScanner.corruptReplica(blockName, i);
-    }
-    assertTrue(corrupted);
+    assertTrue("Could not corrupt block",
+        dfs.corruptBlockOnDataNodes(blockName) > 0);
   }
 }

Modified: 
hadoop/mapreduce/trunk/src/contrib/raid/src/test/org/apache/hadoop/raid/TestReedSolomonDecoder.java
URL: 
http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/contrib/raid/src/test/org/apache/hadoop/raid/TestReedSolomonDecoder.java?rev=1096520&r1=1096519&r2=1096520&view=diff
==============================================================================
--- 
hadoop/mapreduce/trunk/src/contrib/raid/src/test/org/apache/hadoop/raid/TestReedSolomonDecoder.java
 (original)
+++ 
hadoop/mapreduce/trunk/src/contrib/raid/src/test/org/apache/hadoop/raid/TestReedSolomonDecoder.java
 Mon Apr 25 16:58:34 2011
@@ -116,11 +116,8 @@ public class TestReedSolomonDecoder exte
   }
 
   void corruptBlock(String blockName) throws IOException {
-    boolean corrupted = false;
-    for (int i = 0; i < NUM_DATANODES; i++) {
-      corrupted |= TestDatanodeBlockScanner.corruptReplica(blockName, i);
-    }
-    assertTrue(corrupted);
+    assertTrue("Could not corrupt block",
+        dfs.corruptBlockOnDataNodes(blockName) > 0);
   }
 
   private void mySetup() throws Exception {