From df09a85ca9887b6cdbb438112731af01ec32bee3 Mon Sep 17 00:00:00 2001 From: Konstantin Shvachko Date: Sat, 29 Dec 2012 04:26:54 +0000 Subject: [PATCH] HDFS-4347. Avoid infinite waiting checkpoint to complete in TestBackupNode. Contributed by Plamen Jeliazkov. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1426705 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../org/apache/hadoop/hdfs/server/namenode/TestBackupNode.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 2c810620558..65efa5a958a 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -632,6 +632,9 @@ Release 2.0.3-alpha - Unreleased HDFS-4308. addBlock() should persist file blocks once. (Plamen Jeliazkov via shv) + HDFS-4347. Avoid infinite waiting checkpoint to complete in TestBackupNode. + (Plamen Jeliazkov via shv) + BREAKDOWN OF HDFS-3077 SUBTASKS HDFS-3077. Quorum-based protocol for reading and writing edit logs. diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestBackupNode.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestBackupNode.java index 223064893d6..591e0fe9f8d 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestBackupNode.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestBackupNode.java @@ -340,8 +340,8 @@ void testCheckpoint(StartupOption op) throws Exception { // // Take a checkpoint // - backup = startBackupNode(conf, op, 1); long txid = cluster.getNameNodeRpc().getTransactionID(); + backup = startBackupNode(conf, op, 1); waitCheckpointDone(cluster, txid); for (int i = 0; i < 10; i++) {