Repository: hadoop Updated Branches: refs/heads/branch-2 bdf8f64be -> 2e9392c15
HDFS-8358. TestTraceAdmin fails. Contributed by Masatake Iwasaki. (cherry picked from commit f9a46a00d2020c6d6466fbc829ada0521cb78dc0) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/2e9392c1 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/2e9392c1 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/2e9392c1 Branch: refs/heads/branch-2 Commit: 2e9392c1572e32985aaa7e073f35835bd36852bd Parents: bdf8f64 Author: Kihwal Lee <[email protected]> Authored: Wed May 13 14:16:37 2015 -0500 Committer: Kihwal Lee <[email protected]> Committed: Wed May 13 14:16:37 2015 -0500 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../test/java/org/apache/hadoop/tracing/TestTraceAdmin.java | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/2e9392c1/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 c2f80f5..260943d 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -417,6 +417,9 @@ Release 2.8.0 - UNRELEASED HDFS-8362. Java Compilation Error in TestHdfsConfigFields.java (Arshad Mohammad via vinayakumarb) + HDFS-8358. TestTraceAdmin fails (Masatake Iwasaki via kihwal) + + Release 2.7.1 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/2e9392c1/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/tracing/TestTraceAdmin.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/tracing/TestTraceAdmin.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/tracing/TestTraceAdmin.java index 4a102a3..acd0dbb 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/tracing/TestTraceAdmin.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/tracing/TestTraceAdmin.java @@ -72,10 +72,10 @@ public class TestTraceAdmin { Assert.assertEquals("ret:0, [no span receivers found]" + NEWLINE, runTraceCommand(trace, "-list", "-host", getHostPortForNN(cluster))); Assert.assertEquals("ret:0, Added trace span receiver 1 with " + - "configuration local-file-span-receiver.path = " + tracePath + NEWLINE, + "configuration dfs.htrace.local-file-span-receiver.path = " + tracePath + NEWLINE, runTraceCommand(trace, "-add", "-host", getHostPortForNN(cluster), "-class", "org.apache.htrace.impl.LocalFileSpanReceiver", - "-Clocal-file-span-receiver.path=" + tracePath)); + "-Cdfs.htrace.local-file-span-receiver.path=" + tracePath)); String list = runTraceCommand(trace, "-list", "-host", getHostPortForNN(cluster)); Assert.assertTrue(list.startsWith("ret:0")); @@ -86,10 +86,10 @@ public class TestTraceAdmin { Assert.assertEquals("ret:0, [no span receivers found]" + NEWLINE, runTraceCommand(trace, "-list", "-host", getHostPortForNN(cluster))); Assert.assertEquals("ret:0, Added trace span receiver 2 with " + - "configuration local-file-span-receiver.path = " + tracePath + NEWLINE, + "configuration dfs.htrace.local-file-span-receiver.path = " + tracePath + NEWLINE, runTraceCommand(trace, "-add", "-host", getHostPortForNN(cluster), "-class", "LocalFileSpanReceiver", - "-Clocal-file-span-receiver.path=" + tracePath)); + "-Cdfs.htrace.local-file-span-receiver.path=" + tracePath)); Assert.assertEquals("ret:0, Removed trace span receiver 2" + NEWLINE, runTraceCommand(trace, "-remove", "2", "-host", getHostPortForNN(cluster)));
