You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by en...@apache.org on 2015/08/11 10:06:58 UTC
hbase git commit: HBASE-13089 Fix test compilation error on building
against htrace-3.2.0-incubating
Repository: hbase
Updated Branches:
refs/heads/branch-1.1 111620f5c -> b043d27f5
HBASE-13089 Fix test compilation error on building against htrace-3.2.0-incubating
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/b043d27f
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/b043d27f
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/b043d27f
Branch: refs/heads/branch-1.1
Commit: b043d27f59a2c1d025ae3558052f499a554be179
Parents: 111620f
Author: Esteban Gutierrez <es...@apache.org>
Authored: Fri Jul 24 15:34:40 2015 -0700
Committer: Enis Soztutar <en...@apache.org>
Committed: Tue Aug 11 11:04:17 2015 +0300
----------------------------------------------------------------------
.../apache/hadoop/hbase/trace/TestHTraceHooks.java | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/b043d27f/hbase-server/src/test/java/org/apache/hadoop/hbase/trace/TestHTraceHooks.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/trace/TestHTraceHooks.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/trace/TestHTraceHooks.java
index eba30a8..eeda043 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/trace/TestHTraceHooks.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/trace/TestHTraceHooks.java
@@ -21,6 +21,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
+import java.lang.reflect.Method;
import java.util.Collection;
import org.apache.hadoop.hbase.HBaseTestingUtility;
@@ -48,9 +49,19 @@ public class TestHTraceHooks {
private static final byte[] FAMILY_BYTES = "family".getBytes();
private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
private static POJOSpanReceiver rcvr;
+ private static long ROOT_SPAN_ID = 0;
@BeforeClass
public static void before() throws Exception {
+
+ // Find out what the right value to use fo SPAN_ROOT_ID after HTRACE-111. We use HTRACE-32
+ // to find out to detect if we are using HTrace 3.2 or not.
+ try {
+ Method m = Span.class.getMethod("addKVAnnotation", String.class, String.class);
+ } catch (NoSuchMethodException e) {
+ ROOT_SPAN_ID = 0x74aceL; // Span.SPAN_ROOT_ID pre HTrace-3.2
+ }
+
TEST_UTIL.startMiniCluster(2, 3);
rcvr = new POJOSpanReceiver(new HBaseHTraceConfiguration(TEST_UTIL.getConfiguration()));
Trace.addReceiver(rcvr);
@@ -86,7 +97,7 @@ public class TestHTraceHooks {
Collection<Span> spans = rcvr.getSpans();
TraceTree traceTree = new TraceTree(spans);
- Collection<Span> roots = traceTree.getSpansByParent().find(Span.ROOT_SPAN_ID);
+ Collection<Span> roots = traceTree.getSpansByParent().find(ROOT_SPAN_ID);
assertEquals(1, roots.size());
Span createTableRoot = roots.iterator().next();
@@ -117,7 +128,7 @@ public class TestHTraceHooks {
spans = rcvr.getSpans();
traceTree = new TraceTree(spans);
- roots = traceTree.getSpansByParent().find(Span.ROOT_SPAN_ID);
+ roots = traceTree.getSpansByParent().find(ROOT_SPAN_ID);
assertEquals(2, roots.size());
Span putRoot = null;