From 509185c2242d6ef7af292e123d39ba3327836a72 Mon Sep 17 00:00:00 2001 From: Lei Xu Date: Fri, 23 Oct 2015 17:42:23 -0700 Subject: [PATCH] HDFS-9297. Update TestBlockMissingException to use corruptBlockOnDataNodesByDeletingBlockFile(). (Tony Wu via lei) (cherry picked from commit 5679e46b7f867f8f7f8195c86c37e3db7b23d7d7) --- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../hadoop/hdfs/TestBlockMissingException.java | 15 ++------------- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 22b02d61f75..49183909002 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -766,6 +766,9 @@ Release 2.8.0 - UNRELEASED HDFS-9280. Document NFS gateway export point parameter. (Xiao Chen via zhz) + HDFS-9297. Update TestBlockMissingException to use corruptBlockOnDataNodesByDeletingBlockFile(). + (Tony Wu via lei) + BUG FIXES HDFS-8091: ACLStatus and XAttributes should be presented to diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestBlockMissingException.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestBlockMissingException.java index a3104a0f110..7287b5c8be3 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestBlockMissingException.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestBlockMissingException.java @@ -67,7 +67,8 @@ public class TestBlockMissingException { 0, numBlocks * blockSize); // remove block of file LOG.info("Remove first block of file"); - corruptBlock(file1, locations.get(0).getBlock()); + dfs.corruptBlockOnDataNodesByDeletingBlockFile( + locations.get(0).getBlock()); // validate that the system throws BlockMissingException validateFile(fileSys, file1); @@ -118,16 +119,4 @@ public class TestBlockMissingException { stm.close(); assertTrue("Expected BlockMissingException ", gotException); } - - // - // Corrupt specified block of file - // - void corruptBlock(Path file, ExtendedBlock blk) { - // Now deliberately remove/truncate data blocks from the file. - File[] blockFiles = dfs.getAllBlockFiles(blk); - for (File f : blockFiles) { - f.delete(); - LOG.info("Deleted block " + f); - } - } }