Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDFS-2764. Merge r1241780 from trunk to 0.23 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1298229 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Suresh Srinivas 2012-03-07 23:48:42 +00:00
parent 9c8f7e16e5
commit 9aa829fe67
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
View File

@ -173,6 +173,8 @@ Release 0.23.3 - UNRELEASED
HDFS-2285. BackupNode should reject requests to modify namespace. HDFS-2285. BackupNode should reject requests to modify namespace.
(shv and Uma Maheswara Rao) (shv and Uma Maheswara Rao)
HDFS-2764. TestBackupNode is racy. (atm)
Release 0.23.2 - UNRELEASED Release 0.23.2 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

4
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestBackupNode.java
View File

@ -25,8 +25,6 @@ import java.net.InetSocketAddress;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import junit.framework.TestCase;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.apache.commons.logging.impl.Log4JLogger; import org.apache.commons.logging.impl.Log4JLogger;
@ -102,10 +100,10 @@ public class TestBackupNode {
"checkpoint txid should increase above " + txid); "checkpoint txid should increase above " + txid);
Thread.sleep(1000); Thread.sleep(1000);
} catch (Exception e) {} } catch (Exception e) {}
// The checkpoint is not done until the nn has received it from the bn
thisCheckpointTxId = cluster.getNameNode().getFSImage().getStorage() thisCheckpointTxId = cluster.getNameNode().getFSImage().getStorage()
.getMostRecentCheckpointTxId(); .getMostRecentCheckpointTxId();
} while (thisCheckpointTxId < txid); } while (thisCheckpointTxId < txid);
// Check that the checkpoint got uploaded to NN successfully // Check that the checkpoint got uploaded to NN successfully
FSImageTestUtil.assertNNHasCheckpoints(cluster, FSImageTestUtil.assertNNHasCheckpoints(cluster,
Collections.singletonList((int)thisCheckpointTxId)); Collections.singletonList((int)thisCheckpointTxId));