Author: cnauroth
Date: Fri Apr 11 15:49:37 2014
New Revision: 1586696
URL: http://svn.apache.org/r1586696
Log:
HDFS-6235. Merging change r1586692 from trunk to branch-2.
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFileJournalManager.java
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1586696&r1=1586695&r2=1586696&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
(original)
+++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Fri Apr 11 15:49:37 2014
@@ -128,6 +128,9 @@ Release 2.4.1 - UNRELEASED
HDFS-6234. TestDatanodeConfig#testMemlockLimit fails on Windows due to
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
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFileJournalManager.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFileJournalManager.java?rev=1586696&r1=1586695&r2=1586696&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFileJournalManager.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFileJournalManager.java
Fri Apr 11 15:49:37 2014
@@ -140,7 +140,7 @@ public class TestFileJournalManager {
*/
@Test
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
NNStorage storage = setupEdits(Collections.<URI>singletonList(f.toURI()),
5, new AbortSpec(5, 0));
@@ -256,7 +256,7 @@ public class TestFileJournalManager {
*/
@Test
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
NNStorage storage = setupEdits(Collections.<URI>singletonList(f.toURI()),
10, new AbortSpec(10, 0));
@@ -283,7 +283,7 @@ public class TestFileJournalManager {
*/
@Test
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()),
10);
StorageDirectory sd = storage.dirIterator(NameNodeDirType.EDITS).next();
@@ -308,7 +308,7 @@ public class TestFileJournalManager {
*/
@Test
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);
StorageDirectory sd = storage.dirIterator(NameNodeDirType.EDITS).next();
@@ -342,7 +342,7 @@ public class TestFileJournalManager {
*/
@Test
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));
StorageDirectory sd = storage.dirIterator(NameNodeDirType.EDITS).next();
@@ -427,7 +427,7 @@ public class TestFileJournalManager {
@Test
public void testReadFromMiddleOfEditLog() throws CorruptionException,
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()),
10);
StorageDirectory sd = storage.dirIterator(NameNodeDirType.EDITS).next();
@@ -450,7 +450,7 @@ public class TestFileJournalManager {
@Test
public void testExcludeInProgressStreams() throws CorruptionException,
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.
NNStorage storage = setupEdits(Collections.<URI>singletonList(f.toURI()),
