You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by sa...@apache.org on 2017/05/26 17:42:01 UTC
phoenix git commit: PHOENIX-3767 Prevent spurious tracing spans from
Hadoop being written in Phoenix Trace tables (Karan Mehta)
Repository: phoenix
Updated Branches:
refs/heads/master 7c157ec93 -> 0caecfd90
PHOENIX-3767 Prevent spurious tracing spans from Hadoop being written in Phoenix Trace tables (Karan Mehta)
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/0caecfd9
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/0caecfd9
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/0caecfd9
Branch: refs/heads/master
Commit: 0caecfd90685a299e11cca3df2ad8584fbdad302
Parents: 7c157ec
Author: Samarth Jain <sa...@apache.org>
Authored: Fri May 26 10:41:51 2017 -0700
Committer: Samarth Jain <sa...@apache.org>
Committed: Fri May 26 10:41:51 2017 -0700
----------------------------------------------------------------------
.../java/org/apache/phoenix/trace/PhoenixTracingEndToEndIT.java | 1 -
.../main/java/org/apache/phoenix/trace/TraceSpanReceiver.java | 4 ++--
.../java/org/apache/phoenix/trace/TraceMetricsSourceTest.java | 3 ++-
3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/0caecfd9/phoenix-core/src/it/java/org/apache/phoenix/trace/PhoenixTracingEndToEndIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/trace/PhoenixTracingEndToEndIT.java b/phoenix-core/src/it/java/org/apache/phoenix/trace/PhoenixTracingEndToEndIT.java
index 4477fa5..99c1f34 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/trace/PhoenixTracingEndToEndIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/trace/PhoenixTracingEndToEndIT.java
@@ -146,7 +146,6 @@ public class PhoenixTracingEndToEndIT extends BaseTracingTestIT {
* @throws Exception
*/
@Test
- @Ignore
public void testClientServerIndexingTracing() throws Exception {
// one call for client side, one call for server side
http://git-wip-us.apache.org/repos/asf/phoenix/blob/0caecfd9/phoenix-core/src/main/java/org/apache/phoenix/trace/TraceSpanReceiver.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/trace/TraceSpanReceiver.java b/phoenix-core/src/main/java/org/apache/phoenix/trace/TraceSpanReceiver.java
index 3c71e27..fc58c5e 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/trace/TraceSpanReceiver.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/trace/TraceSpanReceiver.java
@@ -75,11 +75,11 @@ public class TraceSpanReceiver implements SpanReceiver {
@Override
public void receiveSpan(Span span) {
- if (spanQueue.offer(span)) {
+ if (span.getTraceId() != 0 && spanQueue.offer(span)) {
if (LOG.isTraceEnabled()) {
LOG.trace("Span buffered to queue " + span.toJson());
}
- } else if (LOG.isDebugEnabled()) {
+ } else if (span.getTraceId() != 0 && LOG.isDebugEnabled()) {
LOG.debug("Span NOT buffered due to overflow in queue " + span.toJson());
}
}
http://git-wip-us.apache.org/repos/asf/phoenix/blob/0caecfd9/phoenix-core/src/test/java/org/apache/phoenix/trace/TraceMetricsSourceTest.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/test/java/org/apache/phoenix/trace/TraceMetricsSourceTest.java b/phoenix-core/src/test/java/org/apache/phoenix/trace/TraceMetricsSourceTest.java
index 7f307da..37cea88 100644
--- a/phoenix-core/src/test/java/org/apache/phoenix/trace/TraceMetricsSourceTest.java
+++ b/phoenix-core/src/test/java/org/apache/phoenix/trace/TraceMetricsSourceTest.java
@@ -71,6 +71,7 @@ public class TraceMetricsSourceTest {
}
private Span getSpan(){
- return new MilliSpan("test span", 0, 1 , 2, "pid");
+ // Spans with Trace Id as 0 will be rejected (See PHOENIX-3767 for details)
+ return new MilliSpan("test span", 1, 1 , 2, "pid");
}
}