HDFS-8358. TestTraceAdmin fails. Contributed by Masatake Iwasaki.

(cherry picked from commit f9a46a00d2)
This commit is contained in:
Kihwal Lee 2015-05-13 14:16:37 -05:00
parent bdf8f64be8
commit 2e9392c157
2 changed files with 7 additions and 4 deletions

View File

@ -417,6 +417,9 @@ Release 2.8.0 - UNRELEASED
HDFS-8362. Java Compilation Error in TestHdfsConfigFields.java HDFS-8362. Java Compilation Error in TestHdfsConfigFields.java
(Arshad Mohammad via vinayakumarb) (Arshad Mohammad via vinayakumarb)
HDFS-8358. TestTraceAdmin fails (Masatake Iwasaki via kihwal)
Release 2.7.1 - UNRELEASED Release 2.7.1 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

View File

@ -72,10 +72,10 @@ public class TestTraceAdmin {
Assert.assertEquals("ret:0, [no span receivers found]" + NEWLINE, Assert.assertEquals("ret:0, [no span receivers found]" + NEWLINE,
runTraceCommand(trace, "-list", "-host", getHostPortForNN(cluster))); runTraceCommand(trace, "-list", "-host", getHostPortForNN(cluster)));
Assert.assertEquals("ret:0, Added trace span receiver 1 with " + 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), runTraceCommand(trace, "-add", "-host", getHostPortForNN(cluster),
"-class", "org.apache.htrace.impl.LocalFileSpanReceiver", "-class", "org.apache.htrace.impl.LocalFileSpanReceiver",
"-Clocal-file-span-receiver.path=" + tracePath)); "-Cdfs.htrace.local-file-span-receiver.path=" + tracePath));
String list = String list =
runTraceCommand(trace, "-list", "-host", getHostPortForNN(cluster)); runTraceCommand(trace, "-list", "-host", getHostPortForNN(cluster));
Assert.assertTrue(list.startsWith("ret:0")); Assert.assertTrue(list.startsWith("ret:0"));
@ -86,10 +86,10 @@ public class TestTraceAdmin {
Assert.assertEquals("ret:0, [no span receivers found]" + NEWLINE, Assert.assertEquals("ret:0, [no span receivers found]" + NEWLINE,
runTraceCommand(trace, "-list", "-host", getHostPortForNN(cluster))); runTraceCommand(trace, "-list", "-host", getHostPortForNN(cluster)));
Assert.assertEquals("ret:0, Added trace span receiver 2 with " + 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), runTraceCommand(trace, "-add", "-host", getHostPortForNN(cluster),
"-class", "LocalFileSpanReceiver", "-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, Assert.assertEquals("ret:0, Removed trace span receiver 2" + NEWLINE,
runTraceCommand(trace, "-remove", "2", "-host", runTraceCommand(trace, "-remove", "2", "-host",
getHostPortForNN(cluster))); getHostPortForNN(cluster)));