Repository: hadoop Updated Branches: refs/heads/HDFS-7240 15ccd967e -> 8966d4217
HDFS-8371. Fix test failure in TestHdfsConfigFields for spanreceiver properties. Contributed by Ray Chiang. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/cbc01ed0 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/cbc01ed0 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/cbc01ed0 Branch: refs/heads/HDFS-7240 Commit: cbc01ed08ea36f70afca6112ccdbf7331567070b Parents: 9a2a955 Author: Akira Ajisaka <aajis...@apache.org> Authored: Fri May 15 12:14:03 2015 +0900 Committer: Akira Ajisaka <aajis...@apache.org> Committed: Fri May 15 12:14:47 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/cbc01ed0/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 4df18ec..b90a773 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -761,6 +761,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/cbc01ed0/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"); } }
