Repository: hadoop Updated Branches: refs/heads/branch-2 ad3196e01 -> 2e5b7f24a
HDFS-8371. Fix test failure in TestHdfsConfigFields for spanreceiver properties. Contributed by Ray Chiang. (cherry picked from commit cbc01ed08ea36f70afca6112ccdbf7331567070b) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/2e5b7f24 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/2e5b7f24 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/2e5b7f24 Branch: refs/heads/branch-2 Commit: 2e5b7f24ab6bedb2544563c80c40b5edba66f920 Parents: ad3196e Author: Akira Ajisaka <[email protected]> Authored: Fri May 15 12:14:03 2015 +0900 Committer: Akira Ajisaka <[email protected]> Committed: Fri May 15 12:15:26 2015 +0900 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../test/java/org/apache/hadoop/tools/TestHdfsConfigFields.java | 4 ++++ 2 files changed, 7 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/2e5b7f24/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 5961d34..a6ef0d5 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -431,6 +431,9 @@ Release 2.8.0 - UNRELEASED HDFS-8150. Make getFileChecksum fail for blocks under construction (J.Andreina via vinayakumarb) + HDFS-8371. Fix test failure in TestHdfsConfigFields for spanreceiver + properties. (Ray Chiang via aajisaka) + Release 2.7.1 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/2e5b7f24/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/tools/TestHdfsConfigFields.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/tools/TestHdfsConfigFields.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/tools/TestHdfsConfigFields.java index a1f8a3c..ec0450a 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/tools/TestHdfsConfigFields.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/tools/TestHdfsConfigFields.java @@ -76,5 +76,9 @@ public class TestHdfsConfigFields extends TestConfigurationFieldsBase { // Some properties have moved to HdfsClientConfigKeys xmlPropsToSkipCompare.add("dfs.client.short.circuit.replica.stale.threshold.ms"); + + // Ignore SpanReceiveHost properties + xmlPropsToSkipCompare.add("dfs.htrace.spanreceiver.classes"); + xmlPropsToSkipCompare.add("dfs.client.htrace.spanreceiver.classes"); } }
