You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by xi...@apache.org on 2017/10/13 21:24:06 UTC
[1/2] hadoop git commit: HDFS-12596. Add
TestFsck#testFsckCorruptWhenOneReplicaIsCorrupt back to branch-2.7.
Repository: hadoop
Updated Branches:
refs/heads/branch-2.7 171a0bd51 -> 754a375d7
HDFS-12596. Add TestFsck#testFsckCorruptWhenOneReplicaIsCorrupt back to branch-2.7.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/754a375d
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/754a375d
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/754a375d
Branch: refs/heads/branch-2.7
Commit: 754a375d77529dd1013e3ec5e800807978461bd4
Parents: d101b98
Author: Xiao Chen <xi...@apache.org>
Authored: Fri Oct 13 14:23:14 2017 -0700
Committer: Xiao Chen <xi...@apache.org>
Committed: Fri Oct 13 14:24:04 2017 -0700
----------------------------------------------------------------------
.../hadoop/hdfs/server/namenode/TestFsck.java | 37 ++++++++++++++++++++
1 file changed, 37 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/754a375d/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFsck.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFsck.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFsck.java
index bd48023..9575e2f 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFsck.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFsck.java
@@ -1471,4 +1471,41 @@ public class TestFsck {
}
}
}
+
+ @Test(timeout = 300000)
+ public void testFsckCorruptWhenOneReplicaIsCorrupt()
+ throws Exception {
+ Configuration conf = new HdfsConfiguration();
+ final MiniDFSCluster cluster = new MiniDFSCluster.Builder(conf)
+ .nnTopology(MiniDFSNNTopology.simpleHATopology()).numDataNodes(2)
+ .build();
+ try {
+ cluster.waitActive();
+ FileSystem fs = HATestUtil.configureFailoverFs(cluster, conf);
+ cluster.transitionToActive(0);
+ String filePath = "/appendTest";
+ Path fileName = new Path(filePath);
+ DFSTestUtil.createFile(fs, fileName, 512, (short) 2, 0);
+ DFSTestUtil.waitReplication(fs, fileName, (short) 2);
+ assertTrue("File not created", fs.exists(fileName));
+ cluster.getDataNodes().get(1).shutdown();
+ DFSTestUtil.appendFile(fs, fileName, "appendCorruptBlock");
+ cluster.restartDataNode(1, true);
+ GenericTestUtils.waitFor(new Supplier<Boolean>() {
+ @Override
+ public Boolean get() {
+ return (
+ cluster.getNameNode(0).getNamesystem().getCorruptReplicaBlocks()
+ > 0);
+ }
+ }, 100, 5000);
+
+ DFSTestUtil.appendFile(fs, fileName, "appendCorruptBlock");
+ runFsck(cluster.getConfiguration(0), 0, true, "/");
+ }finally {
+ if(cluster!=null){
+ cluster.shutdown();
+ }
+ }
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[2/2] hadoop git commit: HDFS-12578.
TestDeadDatanode#testNonDFSUsedONDeadNodeReReg failing in branch-2.7.
Contributed by Ajay Kumar.
Posted by xi...@apache.org.
HDFS-12578. TestDeadDatanode#testNonDFSUsedONDeadNodeReReg failing in branch-2.7. Contributed by Ajay Kumar.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/d101b980
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d101b980
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d101b980
Branch: refs/heads/branch-2.7
Commit: d101b980a14d045da208a252634498f4eceed20d
Parents: 171a0bd
Author: Xiao Chen <xi...@apache.org>
Authored: Fri Oct 13 14:16:09 2017 -0700
Committer: Xiao Chen <xi...@apache.org>
Committed: Fri Oct 13 14:24:04 2017 -0700
----------------------------------------------------------------------
.../hadoop/hdfs/server/blockmanagement/BlockManagerTestUtil.java | 4 +++-
.../org/apache/hadoop/hdfs/server/namenode/TestDeadDatanode.java | 3 ++-
2 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/d101b980/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManagerTestUtil.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManagerTestUtil.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManagerTestUtil.java
index 497ad58..48c6953 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManagerTestUtil.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManagerTestUtil.java
@@ -233,7 +233,9 @@ public class BlockManagerTestUtil {
* @param bm the BlockManager to manipulate
*/
public static void checkHeartbeat(BlockManager bm) {
- bm.getDatanodeManager().getHeartbeatManager().heartbeatCheck();
+ HeartbeatManager hbm = bm.getDatanodeManager().getHeartbeatManager();
+ hbm.restartHeartbeatStopWatch();
+ hbm.heartbeatCheck();
}
/**
http://git-wip-us.apache.org/repos/asf/hadoop/blob/d101b980/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestDeadDatanode.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestDeadDatanode.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestDeadDatanode.java
index 00ea58f..777845a 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestDeadDatanode.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestDeadDatanode.java
@@ -137,7 +137,8 @@ public class TestDeadDatanode {
public void testNonDFSUsedONDeadNodeReReg() throws Exception {
Configuration conf = new HdfsConfiguration();
conf.setInt(DFSConfigKeys.DFS_HEARTBEAT_INTERVAL_KEY, 1);
- conf.setInt(DFSConfigKeys.DFS_NAMENODE_HEARTBEAT_RECHECK_INTERVAL_KEY, 1);
+ conf.setInt(DFSConfigKeys.DFS_NAMENODE_HEARTBEAT_RECHECK_INTERVAL_KEY,
+ 3000);
conf.setInt(DFSConfigKeys.DFS_NAMENODE_STALE_DATANODE_INTERVAL_KEY,
6 * 1000);
try {
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org