Return-Path: X-Original-To: apmail-hadoop-hdfs-commits-archive@minotaur.apache.org Delivered-To: apmail-hadoop-hdfs-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9D35710043 for ; Fri, 11 Apr 2014 15:46:08 +0000 (UTC) Received: (qmail 91435 invoked by uid 500); 11 Apr 2014 15:46:07 -0000 Delivered-To: apmail-hadoop-hdfs-commits-archive@hadoop.apache.org Received: (qmail 91170 invoked by uid 500); 11 Apr 2014 15:46:04 -0000 Mailing-List: contact hdfs-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: hdfs-dev@hadoop.apache.org Delivered-To: mailing list hdfs-commits@hadoop.apache.org Received: (qmail 91160 invoked by uid 99); 11 Apr 2014 15:46:01 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 11 Apr 2014 15:46:01 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 11 Apr 2014 15:46:00 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id ED28E238890B; Fri, 11 Apr 2014 15:45:39 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: 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 Date: Fri, 11 Apr 2014 15:45:39 -0000 To: hdfs-commits@hadoop.apache.org From: cnauroth@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140411154539.ED28E238890B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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.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.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.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.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.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.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.singletonList(f.toURI()),