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

HADOOP-11242. Record the time of calling in tracing span of IPC server. Contributed by Mastake Iwasaki.

This commit is contained in:
Akira Ajisaka 2015-05-27 18:04:40 +09:00
parent cdbd66be11
commit bb1816328a
3 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -617,6 +617,9 @@ Release 2.8.0 - UNRELEASED
HADOOP-11772. RPC Invoker relies on static ClientCache which has HADOOP-11772. RPC Invoker relies on static ClientCache which has
synchronized(this) blocks. (wheat9) synchronized(this) blocks. (wheat9)
HADOOP-11242. Record the time of calling in tracing span of
IPC server. (Masatake Iwasaki via aajisaka)
BUG FIXES BUG FIXES
HADOOP-11802: DomainSocketWatcher thread terminates sometimes after there HADOOP-11802: DomainSocketWatcher thread terminates sometimes after there
is an I/O error during requestShortCircuitShm (cmccabe) is an I/O error during requestShortCircuitShm (cmccabe)

1
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java
View File

@ -2153,6 +2153,7 @@ public abstract class Server {
CurCall.set(call); CurCall.set(call);
if (call.traceSpan != null) { if (call.traceSpan != null) {
traceScope = Trace.continueSpan(call.traceSpan); traceScope = Trace.continueSpan(call.traceSpan);
traceScope.getSpan().addTimelineAnnotation("called");
} }
try { try {

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

@ -120,6 +120,13 @@ public class TestTracing {
Assert.assertEquals(ts.getSpan().getTraceId(), span.getTraceId()); Assert.assertEquals(ts.getSpan().getTraceId(), span.getTraceId());
} }
} }
// test for timeline annotation added by HADOOP-11242
Assert.assertEquals("called",
map.get("org.apache.hadoop.hdfs.protocol.ClientProtocol.create")
.get(0).getTimelineAnnotations()
.get(0).getMessage());
SetSpanReceiver.SetHolder.spans.clear(); SetSpanReceiver.SetHolder.spans.clear();
} }