MAPREDUCE-2448. NoSuchMethodError: org.apache.hadoop.hdfs.TestDatanodeBlockScanner.corruptReplica(..). Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/mapreduce/trunk@1096520 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES.txt b/CHANGES.txt
index 42b1814..3a10c00 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -130,6 +130,9 @@
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
diff --git a/src/contrib/raid/src/test/org/apache/hadoop/raid/TestBlockFixer.java b/src/contrib/raid/src/test/org/apache/hadoop/raid/TestBlockFixer.java
index 16fadde..edce286 100644
--- a/src/contrib/raid/src/test/org/apache/hadoop/raid/TestBlockFixer.java
+++ b/src/contrib/raid/src/test/org/apache/hadoop/raid/TestBlockFixer.java
@@ -637,12 +637,9 @@
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,
diff --git a/src/contrib/raid/src/test/org/apache/hadoop/raid/TestRaidShell.java b/src/contrib/raid/src/test/org/apache/hadoop/raid/TestRaidShell.java
index 8c293b3..19b660f 100644
--- a/src/contrib/raid/src/test/org/apache/hadoop/raid/TestRaidShell.java
+++ b/src/contrib/raid/src/test/org/apache/hadoop/raid/TestRaidShell.java
@@ -287,10 +287,7 @@
}
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);
}
}
diff --git a/src/contrib/raid/src/test/org/apache/hadoop/raid/TestReedSolomonDecoder.java b/src/contrib/raid/src/test/org/apache/hadoop/raid/TestReedSolomonDecoder.java
index 0a69d74..c9b74d6 100644
--- a/src/contrib/raid/src/test/org/apache/hadoop/raid/TestReedSolomonDecoder.java
+++ b/src/contrib/raid/src/test/org/apache/hadoop/raid/TestReedSolomonDecoder.java
@@ -116,11 +116,8 @@
}
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 {
