Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDFS-7001. Tests in TestTracing should not depend on the order of execution. (iwasakims via cmccabe) 

(cherry picked from commit 7b8df93ce1)
This commit is contained in:
Colin Patrick Mccabe 2014-09-22 17:21:58 -07:00
parent 3984435661
commit cac7063b31
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
View File

@ -450,6 +450,9 @@ Release 2.6.0 - UNRELEASED
HDFS-7106. Reconfiguring DataNode volumes does not release the lock files HDFS-7106. Reconfiguring DataNode volumes does not release the lock files
in removed volumes. (cnauroth via cmccabe) in removed volumes. (cnauroth via cmccabe)
HDFS-7001. Tests in TestTracing depends on the order of execution
(iwasakims via cmccabe)
BREAKDOWN OF HDFS-6134 AND HADOOP-10150 SUBTASKS AND RELATED JIRAS BREAKDOWN OF HDFS-6134 AND HADOOP-10150 SUBTASKS AND RELATED JIRAS
HDFS-6387. HDFS CLI admin tool for creating & deleting an HDFS-6387. HDFS CLI admin tool for creating & deleting an

14
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/tracing/TestTracing.java
View File

@ -53,13 +53,15 @@ public class TestTracing {
private static Configuration conf; private static Configuration conf;
private static MiniDFSCluster cluster; private static MiniDFSCluster cluster;
private static DistributedFileSystem dfs; private static DistributedFileSystem dfs;
private static SpanReceiverHost spanReceiverHost;
@Test @Test
public void testSpanReceiverHost() throws Exception { public void testGetSpanReceiverHost() throws Exception {
Configuration conf = new Configuration(); Configuration c = new Configuration();
conf.set(SpanReceiverHost.SPAN_RECEIVERS_CONF_KEY, // getting instance already loaded.
SetSpanReceiver.class.getName()); c.set(SpanReceiverHost.SPAN_RECEIVERS_CONF_KEY, "");
SpanReceiverHost spanReceiverHost = SpanReceiverHost.getInstance(conf); SpanReceiverHost s = SpanReceiverHost.getInstance(c);
Assert.assertEquals(spanReceiverHost, s);
} }
@Test @Test
@ -228,8 +230,10 @@ public class TestTracing {
cluster = new MiniDFSCluster.Builder(conf) cluster = new MiniDFSCluster.Builder(conf)
.numDataNodes(3) .numDataNodes(3)
.build(); .build();
cluster.waitActive();
dfs = cluster.getFileSystem(); dfs = cluster.getFileSystem();
spanReceiverHost = SpanReceiverHost.getInstance(conf);
} }
@AfterClass @AfterClass