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 zj...@apache.org on 2015/03/27 07:34:46 UTC
[44/50] [abbrv] hadoop git commit: HDFS-7963. Fix expected tracing
spans in TestTracing. Contributed by Masatake Iwasaki.
HDFS-7963. Fix expected tracing spans in TestTracing. Contributed by Masatake Iwasaki.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b1ab3f28
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b1ab3f28
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b1ab3f28
Branch: refs/heads/YARN-2928
Commit: b1ab3f284aa99dcb3100285cbd99ebd74dfa2806
Parents: 0a9ce4a
Author: Kihwal Lee <ki...@apache.org>
Authored: Thu Mar 26 08:42:45 2015 -0500
Committer: Zhijie Shen <zj...@apache.org>
Committed: Thu Mar 26 23:29:49 2015 -0700
----------------------------------------------------------------------
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++
.../org/apache/hadoop/tracing/TestTracing.java | 28 ++++++++++++++++----
2 files changed, 26 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/b1ab3f28/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index 62c2f91..51842ff 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -1277,6 +1277,9 @@ Release 2.7.0 - UNRELEASED
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
HDFS-7720. Quota by Storage Type API, tools and ClientNameNode
http://git-wip-us.apache.org/repos/asf/hadoop/blob/b1ab3f28/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 0bbd5b4..3720abe 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
@@ -88,7 +88,10 @@ public class TestTracing {
"ClientNamenodeProtocol#fsync",
"org.apache.hadoop.hdfs.protocol.ClientProtocol.complete",
"ClientNamenodeProtocol#complete",
- "DFSOutputStream",
+ "newStreamForCreate",
+ "DFSOutputStream#writeChunk",
+ "DFSOutputStream#close",
+ "dataStreamer",
"OpWriteBlockProto",
"org.apache.hadoop.hdfs.protocol.ClientProtocol.addBlock",
"ClientNamenodeProtocol#addBlock"
@@ -102,10 +105,25 @@ public class TestTracing {
long spanStart = s.getStartTimeMillis();
long spanEnd = s.getStopTimeMillis();
- // There should only be one trace id as it should all be homed in the
- // top trace.
- for (Span span : SetSpanReceiver.SetHolder.spans.values()) {
- Assert.assertEquals(ts.getSpan().getTraceId(), span.getTraceId());
+ // Spans homed in the top trace shoud have same trace id.
+ // Spans having multiple parents (e.g. "dataStreamer" added by HDFS-7054)
+ // 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());
+ }
}
}