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 ae...@apache.org on 2016/03/18 19:25:18 UTC
[18/46] hadoop git commit: HDFS-9904.
testCheckpointCancellationDuringUpload occasionally fails. Contributed by Lin
Yiqun.
HDFS-9904. testCheckpointCancellationDuringUpload occasionally fails. Contributed by Lin Yiqun.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/d4574017
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d4574017
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d4574017
Branch: refs/heads/HDFS-7240
Commit: d4574017845cfa7521e703f80efd404afd09b8c4
Parents: 5de848c
Author: Kihwal Lee <ki...@apache.org>
Authored: Tue Mar 15 10:52:47 2016 -0500
Committer: Kihwal Lee <ki...@apache.org>
Committed: Tue Mar 15 10:52:47 2016 -0500
----------------------------------------------------------------------
.../hadoop/hdfs/server/namenode/ha/TestStandbyCheckpoints.java | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/d4574017/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestStandbyCheckpoints.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestStandbyCheckpoints.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestStandbyCheckpoints.java
index 234bc7b..7c0ed7b 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestStandbyCheckpoints.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestStandbyCheckpoints.java
@@ -291,6 +291,11 @@ public class TestStandbyCheckpoints {
*/
@Test(timeout=60000)
public void testCheckpointCancellationDuringUpload() throws Exception {
+ // Set dfs.namenode.checkpoint.txns differently on the first NN to avoid it
+ // doing checkpoint when it becomes a standby
+ cluster.getConfiguration(0).setInt(
+ DFSConfigKeys.DFS_NAMENODE_CHECKPOINT_TXNS_KEY, 1000);
+
// don't compress, we want a big image
for (int i = 0; i < NUM_NNS; i++) {
cluster.getConfiguration(i).setBoolean(