diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 221f2b574d..5aced5e81f 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -570,9 +570,6 @@ Branch-2 ( Unreleased changes ) HDFS-3756. DelegationTokenFetcher creates 2 HTTP connections, the second one not properly configured. (tucu) - HDFS-3719. Re-enable append-related tests in TestFileConcurrentReader. - (Andrew Wang via atm) - HDFS-3579. libhdfs: fix exception handling. (Colin Patrick McCabe via atm) HDFS-3754. BlockSender doesn't shutdown ReadaheadPool threads. (eli) diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestFileConcurrentReader.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestFileConcurrentReader.java index 003dc6fbf4..97659eeab3 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestFileConcurrentReader.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestFileConcurrentReader.java @@ -288,8 +288,10 @@ public void testUnfinishedBlockCRCErrorTransferToVerySmallWrite() runTestUnfinishedBlockCRCError(true, SyncType.SYNC, SMALL_WRITE_SIZE); } + // fails due to issue w/append, disable + @Ignore @Test - public void testUnfinishedBlockCRCErrorTransferToAppend() + public void _testUnfinishedBlockCRCErrorTransferToAppend() throws IOException { runTestUnfinishedBlockCRCError(true, SyncType.APPEND, DEFAULT_WRITE_SIZE); } @@ -305,8 +307,10 @@ public void testUnfinishedBlockCRCErrorNormalTransferVerySmallWrite() runTestUnfinishedBlockCRCError(false, SyncType.SYNC, SMALL_WRITE_SIZE); } + // fails due to issue w/append, disable + @Ignore @Test - public void testUnfinishedBlockCRCErrorNormalTransferAppend() + public void _testUnfinishedBlockCRCErrorNormalTransferAppend() throws IOException { runTestUnfinishedBlockCRCError(false, SyncType.APPEND, DEFAULT_WRITE_SIZE); }