[25/50] hadoop git commit: HDFS-9297. Update TestBlockMissingException to use corruptBlockOnDataNodesByDeletingBlockFile(). (Tony Wu via lei)

2015-10-27 Thread jing9 
HDFS-9297. Update TestBlockMissingException to use 
corruptBlockOnDataNodesByDeletingBlockFile(). (Tony Wu via lei)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/5679e46b
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/5679e46b
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/5679e46b

Branch: refs/heads/HDFS-8966
Commit: 5679e46b7f867f8f7f8195c86c37e3db7b23d7d7
Parents: 15eb84b
Author: Lei Xu 
Authored: Fri Oct 23 17:42:23 2015 -0700
Committer: Lei Xu 
Committed: Fri Oct 23 17:42:23 2015 -0700

--
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt  |  3 +++
 .../hadoop/hdfs/TestBlockMissingException.java   | 15 ++-
 2 files changed, 5 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/5679e46b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
--
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt 
b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index 1641884..f5f13cf 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -1602,6 +1602,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-7501. TransactionsSinceLastCheckpoint can be negative on SBNs.

http://git-wip-us.apache.org/repos/asf/hadoop/blob/5679e46b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestBlockMissingException.java
--
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 a3104a0..7287b5c 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);
-}
-  }
 }

hadoop git commit: HDFS-9297. Update TestBlockMissingException to use corruptBlockOnDataNodesByDeletingBlockFile(). (Tony Wu via lei)

2015-10-23 Thread lei 
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 558ae8c2d -> 509185c22


HDFS-9297. Update TestBlockMissingException to use 
corruptBlockOnDataNodesByDeletingBlockFile(). (Tony Wu via lei)

(cherry picked from commit 5679e46b7f867f8f7f8195c86c37e3db7b23d7d7)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/509185c2
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/509185c2
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/509185c2

Branch: refs/heads/branch-2
Commit: 509185c2242d6ef7af292e123d39ba3327836a72
Parents: 558ae8c
Author: Lei Xu 
Authored: Fri Oct 23 17:42:23 2015 -0700
Committer: Lei Xu 
Committed: Fri Oct 23 17:42:59 2015 -0700

--
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt  |  3 +++
 .../hadoop/hdfs/TestBlockMissingException.java   | 15 ++-
 2 files changed, 5 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/509185c2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
--
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt 
b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index 22b02d6..4918390 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

http://git-wip-us.apache.org/repos/asf/hadoop/blob/509185c2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestBlockMissingException.java
--
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 a3104a0..7287b5c 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);
-}
-  }
 }

hadoop git commit: HDFS-9297. Update TestBlockMissingException to use corruptBlockOnDataNodesByDeletingBlockFile(). (Tony Wu via lei)

2015-10-23 Thread lei 
Repository: hadoop
Updated Branches:
  refs/heads/trunk 15eb84b37 -> 5679e46b7


HDFS-9297. Update TestBlockMissingException to use 
corruptBlockOnDataNodesByDeletingBlockFile(). (Tony Wu via lei)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/5679e46b
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/5679e46b
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/5679e46b

Branch: refs/heads/trunk
Commit: 5679e46b7f867f8f7f8195c86c37e3db7b23d7d7
Parents: 15eb84b
Author: Lei Xu 
Authored: Fri Oct 23 17:42:23 2015 -0700
Committer: Lei Xu 
Committed: Fri Oct 23 17:42:23 2015 -0700

--
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt  |  3 +++
 .../hadoop/hdfs/TestBlockMissingException.java   | 15 ++-
 2 files changed, 5 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/5679e46b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
--
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt 
b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index 1641884..f5f13cf 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -1602,6 +1602,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-7501. TransactionsSinceLastCheckpoint can be negative on SBNs.

http://git-wip-us.apache.org/repos/asf/hadoop/blob/5679e46b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestBlockMissingException.java
--
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 a3104a0..7287b5c 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);
-}
-  }
 }