You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by aa...@apache.org on 2015/05/27 11:06:39 UTC
hadoop git commit: HADOOP-11242. Record the time of calling in
tracing span of IPC server. Contributed by Mastake Iwasaki.
Repository: hadoop
Updated Branches:
refs/heads/trunk cdbd66be1 -> bb1816328
HADOOP-11242. Record the time of calling in tracing span of IPC server. Contributed by Mastake Iwasaki.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/bb181632
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/bb181632
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/bb181632
Branch: refs/heads/trunk
Commit: bb1816328a36ec3f8c6bd9fdb950d9a4ec8388c8
Parents: cdbd66b
Author: Akira Ajisaka <aa...@apache.org>
Authored: Wed May 27 18:04:40 2015 +0900
Committer: Akira Ajisaka <aa...@apache.org>
Committed: Wed May 27 18:04:40 2015 +0900
----------------------------------------------------------------------
hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++
.../src/main/java/org/apache/hadoop/ipc/Server.java | 1 +
.../src/test/java/org/apache/hadoop/tracing/TestTracing.java | 7 +++++++
3 files changed, 11 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/bb181632/hadoop-common-project/hadoop-common/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 864865f..552443c 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -617,6 +617,9 @@ Release 2.8.0 - UNRELEASED
HADOOP-11772. RPC Invoker relies on static ClientCache which has
synchronized(this) blocks. (wheat9)
+ HADOOP-11242. Record the time of calling in tracing span of
+ IPC server. (Masatake Iwasaki via aajisaka)
+
BUG FIXES
HADOOP-11802: DomainSocketWatcher thread terminates sometimes after there
is an I/O error during requestShortCircuitShm (cmccabe)
http://git-wip-us.apache.org/repos/asf/hadoop/blob/bb181632/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java
index ac32ac9..98fffc0 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java
@@ -2153,6 +2153,7 @@ public abstract class Server {
CurCall.set(call);
if (call.traceSpan != null) {
traceScope = Trace.continueSpan(call.traceSpan);
+ traceScope.getSpan().addTimelineAnnotation("called");
}
try {
http://git-wip-us.apache.org/repos/asf/hadoop/blob/bb181632/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/tracing/TestTracing.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/tracing/TestTracing.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/tracing/TestTracing.java
index 59d1238..7fb8ac5 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/tracing/TestTracing.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/tracing/TestTracing.java
@@ -120,6 +120,13 @@ public class TestTracing {
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();
}