You are viewing a plain text version of this content. The canonical link for it is here.
Posted to hdfs-commits@hadoop.apache.org by cn...@apache.org on 2014/04/11 17:45:39 UTC
svn commit: r1586692 - in
/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs: CHANGES.txt
src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFileJournalManager.java
Author: cnauroth
Date: Fri Apr 11 15:45:39 2014
New Revision: 1586692
URL: http://svn.apache.org/r1586692
Log:
HDFS-6235. TestFileJournalManager can fail on Windows due to file locking if tests run out of order. Contributed by Chris Nauroth.
Modified:
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFileJournalManager.java
Modified: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1586692&r1=1586691&r2=1586692&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Fri Apr 11 15:45:39 2014
@@ -378,6 +378,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/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFileJournalManager.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFileJournalManager.java?rev=1586692&r1=1586691&r2=1586692&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFileJournalManager.java (original)
+++ hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFileJournalManager.java Fri Apr 11 15:45:39 2014
@@ -139,7 +139,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));
@@ -255,7 +255,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));
@@ -282,7 +282,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();
@@ -307,7 +307,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();
@@ -341,7 +341,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();
@@ -426,7 +426,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();
@@ -449,7 +449,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()),