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

HDFS-6235. Merging change r1586692 from trunk to branch-2. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586696 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Chris Nauroth 2014-04-11 15:49:37 +00:00
parent fbc9db6954
commit 77beb3573c
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -128,6 +128,9 @@ Release 2.4.1 - UNRELEASED
HDFS-6234. TestDatanodeConfig#testMemlockLimit fails on Windows due to HDFS-6234. TestDatanodeConfig#testMemlockLimit fails on Windows due to
invalid file path. (cnauroth) invalid file path. (cnauroth)
HDFS-6235. TestFileJournalManager can fail on Windows due to file locking if
tests run out of order. (cnauroth)
Release 2.4.0 - 2014-04-07 Release 2.4.0 - 2014-04-07
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

14
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFileJournalManager.java
View File

@ -140,7 +140,7 @@ public class TestFileJournalManager {
*/ */
@Test @Test
public void testInprogressRecovery() throws IOException { public void testInprogressRecovery() throws IOException {
File f = new File(TestEditLog.TEST_DIR + "/filejournaltest0"); File f = new File(TestEditLog.TEST_DIR + "/inprogressrecovery");
// abort after the 5th roll // abort after the 5th roll
NNStorage storage = setupEdits(Collections.<URI>singletonList(f.toURI()), NNStorage storage = setupEdits(Collections.<URI>singletonList(f.toURI()),
5, new AbortSpec(5, 0)); 5, new AbortSpec(5, 0));
@ -256,7 +256,7 @@ public class TestFileJournalManager {
*/ */
@Test @Test
public void testReadFromStream() throws IOException { public void testReadFromStream() throws IOException {
File f = new File(TestEditLog.TEST_DIR + "/filejournaltest1"); File f = new File(TestEditLog.TEST_DIR + "/readfromstream");
// abort after 10th roll // abort after 10th roll
NNStorage storage = setupEdits(Collections.<URI>singletonList(f.toURI()), NNStorage storage = setupEdits(Collections.<URI>singletonList(f.toURI()),
10, new AbortSpec(10, 0)); 10, new AbortSpec(10, 0));
@ -283,7 +283,7 @@ public class TestFileJournalManager {
*/ */
@Test @Test
public void testAskForTransactionsMidfile() throws IOException { public void testAskForTransactionsMidfile() throws IOException {
File f = new File(TestEditLog.TEST_DIR + "/filejournaltest2"); File f = new File(TestEditLog.TEST_DIR + "/askfortransactionsmidfile");
NNStorage storage = setupEdits(Collections.<URI>singletonList(f.toURI()), NNStorage storage = setupEdits(Collections.<URI>singletonList(f.toURI()),
10); 10);
StorageDirectory sd = storage.dirIterator(NameNodeDirType.EDITS).next(); StorageDirectory sd = storage.dirIterator(NameNodeDirType.EDITS).next();
@ -308,7 +308,7 @@ public class TestFileJournalManager {
*/ */
@Test @Test
public void testManyLogsWithGaps() throws IOException { public void testManyLogsWithGaps() throws IOException {
File f = new File(TestEditLog.TEST_DIR + "/filejournaltest3"); File f = new File(TestEditLog.TEST_DIR + "/manylogswithgaps");
NNStorage storage = setupEdits(Collections.<URI>singletonList(f.toURI()), 10); NNStorage storage = setupEdits(Collections.<URI>singletonList(f.toURI()), 10);
StorageDirectory sd = storage.dirIterator(NameNodeDirType.EDITS).next(); StorageDirectory sd = storage.dirIterator(NameNodeDirType.EDITS).next();
@ -342,7 +342,7 @@ public class TestFileJournalManager {
*/ */
@Test @Test
public void testManyLogsWithCorruptInprogress() throws IOException { public void testManyLogsWithCorruptInprogress() throws IOException {
File f = new File(TestEditLog.TEST_DIR + "/filejournaltest5"); File f = new File(TestEditLog.TEST_DIR + "/manylogswithcorruptinprogress");
NNStorage storage = setupEdits(Collections.<URI>singletonList(f.toURI()), 10, new AbortSpec(10, 0)); NNStorage storage = setupEdits(Collections.<URI>singletonList(f.toURI()), 10, new AbortSpec(10, 0));
StorageDirectory sd = storage.dirIterator(NameNodeDirType.EDITS).next(); StorageDirectory sd = storage.dirIterator(NameNodeDirType.EDITS).next();
@ -427,7 +427,7 @@ public class TestFileJournalManager {
@Test @Test
public void testReadFromMiddleOfEditLog() throws CorruptionException, public void testReadFromMiddleOfEditLog() throws CorruptionException,
IOException { IOException {
File f = new File(TestEditLog.TEST_DIR + "/filejournaltest2"); File f = new File(TestEditLog.TEST_DIR + "/readfrommiddleofeditlog");
NNStorage storage = setupEdits(Collections.<URI>singletonList(f.toURI()), NNStorage storage = setupEdits(Collections.<URI>singletonList(f.toURI()),
10); 10);
StorageDirectory sd = storage.dirIterator(NameNodeDirType.EDITS).next(); StorageDirectory sd = storage.dirIterator(NameNodeDirType.EDITS).next();
@ -450,7 +450,7 @@ public class TestFileJournalManager {
@Test @Test
public void testExcludeInProgressStreams() throws CorruptionException, public void testExcludeInProgressStreams() throws CorruptionException,
IOException { IOException {
File f = new File(TestEditLog.TEST_DIR + "/filejournaltest2"); File f = new File(TestEditLog.TEST_DIR + "/excludeinprogressstreams");
// Don't close the edit log once the files have been set up. // Don't close the edit log once the files have been set up.
NNStorage storage = setupEdits(Collections.<URI>singletonList(f.toURI()), NNStorage storage = setupEdits(Collections.<URI>singletonList(f.toURI()),