Repository: hadoop Updated Branches: refs/heads/branch-2 0728a86b3 -> 9670762a8
HADOOP-11242. Record the time of calling in tracing span of IPC server. Contributed by Mastake Iwasaki. (cherry picked from commit bb1816328a36ec3f8c6bd9fdb950d9a4ec8388c8) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/9670762a Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/9670762a Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/9670762a Branch: refs/heads/branch-2 Commit: 9670762a82a3c63bdfe6cd4feb86025ad640a56e Parents: 0728a86 Author: Akira Ajisaka <[email protected]> Authored: Wed May 27 18:04:40 2015 +0900 Committer: Akira Ajisaka <[email protected]> Committed: Wed May 27 18:05:08 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/9670762a/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 0091f56..b6c8459 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -146,6 +146,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/9670762a/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 fa25cac..7270334 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 @@ -2067,6 +2067,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/9670762a/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(); }
