[2/2] hadoop git commit: HDFS-8847. change TestHDFSContractAppend to not override testRenameFileBeingAppended method. Contributed by Zhihai Xu
HDFS-8847. change TestHDFSContractAppend to not override
testRenameFileBeingAppended method. Contributed by Zhihai Xu
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/90b51040
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/90b51040
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/90b51040
Branch: refs/heads/trunk
Commit: 90b510405af5ac9d4947c4201065b64994f7ef63
Parents: a628a6f
Author: Zhihai Xu z...@apache.org
Authored: Fri Jul 31 21:40:43 2015 -0700
Committer: Zhihai Xu z...@apache.org
Committed: Fri Jul 31 21:40:43 2015 -0700
--
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++
.../fs/contract/hdfs/TestHDFSContractAppend.java | 15 ---
2 files changed, 3 insertions(+), 15 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/90b51040/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
--
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index d5181e7..a2d7c2f 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
http://git-wip-us.apache.org/repos/asf/hadoop/blob/90b51040/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/contract/hdfs/TestHDFSContractAppend.java
--
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 c9148e1..897354c 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 @@ package org.apache.hadoop.fs.contract.hdfs;
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 class TestHDFSContractAppend extends
AbstractContractAppendTest {
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);
-
-}
- }
}
[2/2] hadoop git commit: HDFS-8847. change TestHDFSContractAppend to not override testRenameFileBeingAppended method. Contributed by Zhihai Xu
HDFS-8847. change TestHDFSContractAppend to not override
testRenameFileBeingAppended method. Contributed by Zhihai Xu
(cherry picked from commit 90b510405af5ac9d4947c4201065b64994f7ef63)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/c6e79178
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c6e79178
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c6e79178
Branch: refs/heads/branch-2
Commit: c6e79178d43e77e9e175aa8049d88672f5715862
Parents: b9ec7f1
Author: Zhihai Xu z...@apache.org
Authored: Fri Jul 31 21:40:43 2015 -0700
Committer: Zhihai Xu z...@apache.org
Committed: Fri Jul 31 21:48:03 2015 -0700
--
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++
.../fs/contract/hdfs/TestHDFSContractAppend.java | 15 ---
2 files changed, 3 insertions(+), 15 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c6e79178/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
--
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index 87d82bc..f03fb21 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -764,6 +764,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
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c6e79178/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/contract/hdfs/TestHDFSContractAppend.java
--
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 c9148e1..897354c 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 @@ package org.apache.hadoop.fs.contract.hdfs;
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 class TestHDFSContractAppend extends
AbstractContractAppendTest {
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);
-
-}
- }
}
