From f9a46a00d2020c6d6466fbc829ada0521cb78dc0 Mon Sep 17 00:00:00 2001 From: Kihwal Lee Date: Wed, 13 May 2015 14:15:27 -0500 Subject: [PATCH] HDFS-8358. TestTraceAdmin fails. Contributed by Masatake Iwasaki. --- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../java/org/apache/hadoop/tracing/TestTraceAdmin.java | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 4fabf97187f..f4e40b7b4d5 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -747,6 +747,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 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 4a102a3729b..acd0dbb4e8c 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)));