diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index d5181e7987..a2d7c2f54a 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -1106,6 +1106,9 @@ Release 2.8.0 - UNRELEASED HDFS-8670. Better to exclude decommissioned nodes for namenode NodeUsage JMX (J.Andreina via vinayakumarb) + HDFS-8847. change TestHDFSContractAppend to not override + testRenameFileBeingAppended method. (Zhihai Xu) + Release 2.7.2 - UNRELEASED INCOMPATIBLE CHANGES diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/contract/hdfs/TestHDFSContractAppend.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/contract/hdfs/TestHDFSContractAppend.java index c9148e10de..897354c138 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/contract/hdfs/TestHDFSContractAppend.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/contract/hdfs/TestHDFSContractAppend.java @@ -17,11 +17,9 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.contract.AbstractContractAppendTest; import org.apache.hadoop.fs.contract.AbstractFSContract; -import org.apache.hadoop.fs.contract.ContractTestUtils; import org.junit.AfterClass; import org.junit.BeforeClass; -import java.io.FileNotFoundException; import java.io.IOException; public class TestHDFSContractAppend extends AbstractContractAppendTest { @@ -40,17 +38,4 @@ public static void teardownCluster() throws IOException { protected AbstractFSContract createContract(Configuration conf) { return new HDFSContract(conf); } - - @Override - public void testRenameFileBeingAppended() throws Throwable { - try { - super.testRenameFileBeingAppended(); - fail("Expected a FileNotFoundException"); - } catch (FileNotFoundException e) { - // downgrade - ContractTestUtils.downgrade("Renaming an open file" + - "still creates the old path", e); - - } - } }