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

HDFS-7963. Fix expected tracing spans in TestTracing. Contributed by Masatake Iwasaki.

This commit is contained in:
Kihwal Lee 2015-03-26 08:42:45 -05:00
parent c33ecd83e4
commit 071277b9ce
2 changed files with 26 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

@ -973,6 +973,9 @@ Release 2.7.0 - UNRELEASED
HDFS-7977. NFS couldn't take percentile intervals (brandonli) HDFS-7977. NFS couldn't take percentile intervals (brandonli)
HDFS-7963. Fix expected tracing spans in TestTracing along with HDFS-7054.
(Masatake Iwasaki via kihwal)
BREAKDOWN OF HDFS-7584 SUBTASKS AND RELATED JIRAS BREAKDOWN OF HDFS-7584 SUBTASKS AND RELATED JIRAS
HDFS-7720. Quota by Storage Type API, tools and ClientNameNode HDFS-7720. Quota by Storage Type API, tools and ClientNameNode

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

@ -88,7 +88,10 @@ public class TestTracing {
"ClientNamenodeProtocol#fsync", "ClientNamenodeProtocol#fsync",
"org.apache.hadoop.hdfs.protocol.ClientProtocol.complete", "org.apache.hadoop.hdfs.protocol.ClientProtocol.complete",
"ClientNamenodeProtocol#complete", "ClientNamenodeProtocol#complete",
"DFSOutputStream", "newStreamForCreate",
"DFSOutputStream#writeChunk",
"DFSOutputStream#close",
"dataStreamer",
"OpWriteBlockProto", "OpWriteBlockProto",
"org.apache.hadoop.hdfs.protocol.ClientProtocol.addBlock", "org.apache.hadoop.hdfs.protocol.ClientProtocol.addBlock",
"ClientNamenodeProtocol#addBlock" "ClientNamenodeProtocol#addBlock"
@ -102,12 +105,27 @@ public class TestTracing {
long spanStart = s.getStartTimeMillis(); long spanStart = s.getStartTimeMillis();
long spanEnd = s.getStopTimeMillis(); long spanEnd = s.getStopTimeMillis();
// There should only be one trace id as it should all be homed in the // Spans homed in the top trace shoud have same trace id.
// top trace. // Spans having multiple parents (e.g. "dataStreamer" added by HDFS-7054)
for (Span span : SetSpanReceiver.SetHolder.spans.values()) { // and children of them are exception.
String[] spansInTopTrace = {
"testWriteTraceHooks",
"org.apache.hadoop.hdfs.protocol.ClientProtocol.create",
"ClientNamenodeProtocol#create",
"org.apache.hadoop.hdfs.protocol.ClientProtocol.fsync",
"ClientNamenodeProtocol#fsync",
"org.apache.hadoop.hdfs.protocol.ClientProtocol.complete",
"ClientNamenodeProtocol#complete",
"newStreamForCreate",
"DFSOutputStream#writeChunk",
"DFSOutputStream#close",
};
for (String desc : spansInTopTrace) {
for (Span span : map.get(desc)) {
Assert.assertEquals(ts.getSpan().getTraceId(), span.getTraceId()); Assert.assertEquals(ts.getSpan().getTraceId(), span.getTraceId());
} }
} }
}
@Test @Test
public void testWriteWithoutTraceHooks() throws Exception { public void testWriteWithoutTraceHooks() throws Exception {