Repository: phoenix Updated Branches: refs/heads/master 2d27179b3 -> b4b764236
PHOENIX-3304 Tracing tests failing Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/b4b76423 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/b4b76423 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/b4b76423 Branch: refs/heads/master Commit: b4b7642363c6b9921212b9c4e7ec237dcc88f00e Parents: 2d27179 Author: James Taylor <jamestay...@apache.org> Authored: Tue Sep 20 22:39:19 2016 -0700 Committer: James Taylor <jamestay...@apache.org> Committed: Tue Sep 20 22:39:19 2016 -0700 ---------------------------------------------------------------------- .../apache/phoenix/trace/BaseTracingTestIT.java | 14 ------------- .../phoenix/trace/PhoenixTracingEndToEndIT.java | 22 +++++++++----------- .../apache/phoenix/trace/TracingTestUtil.java | 8 +++++-- 3 files changed, 16 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/b4b76423/phoenix-core/src/it/java/org/apache/phoenix/trace/BaseTracingTestIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/trace/BaseTracingTestIT.java b/phoenix-core/src/it/java/org/apache/phoenix/trace/BaseTracingTestIT.java index 7e5d17f..eed5618 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/trace/BaseTracingTestIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/trace/BaseTracingTestIT.java @@ -38,13 +38,10 @@ import org.apache.hadoop.metrics2.impl.ExposedMetricsRecordImpl; import org.apache.hadoop.metrics2.lib.ExposedMetricsInfoImpl; import org.apache.phoenix.end2end.ParallelStatsDisabledIT; import org.apache.phoenix.metrics.MetricInfo; -import org.apache.phoenix.query.QueryServicesOptions; -import org.apache.phoenix.schema.TableNotFoundException; import org.apache.phoenix.trace.util.Tracing; import org.apache.phoenix.trace.util.Tracing.Frequency; import org.apache.phoenix.util.PhoenixRuntime; import org.apache.phoenix.util.PropertiesUtil; -import org.junit.Before; /** * Base test for tracing tests - helps manage getting tracing/non-tracing @@ -52,16 +49,6 @@ import org.junit.Before; */ public class BaseTracingTestIT extends ParallelStatsDisabledIT { - @Before - public void resetTracingTableIfExists() throws Exception { - Connection conn = getConnectionWithoutTracing(); - conn.setAutoCommit(true); - try { - conn.createStatement().executeUpdate( - "DELETE FROM " + QueryServicesOptions.DEFAULT_TRACING_STATS_TABLE_NAME); - } catch (TableNotFoundException ignore) { - } - } public static Connection getConnectionWithoutTracing() throws SQLException { Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES); @@ -70,7 +57,6 @@ public class BaseTracingTestIT extends ParallelStatsDisabledIT { public static Connection getConnectionWithoutTracing(Properties props) throws SQLException { Connection conn = getConnectionWithTracingFrequency(props, Frequency.NEVER); - conn.setAutoCommit(false); return conn; } http://git-wip-us.apache.org/repos/asf/phoenix/blob/b4b76423/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 d6ca23b..8097cc9 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 @@ -64,25 +64,26 @@ public class PhoenixTracingEndToEndIT extends BaseTracingTestIT { private String enableForLoggingIndex; private DisableableMetricsWriter sink; - private String tableName; + private String tracingTableName; @Before public void setupMetrics() throws Exception { PhoenixMetricsSink pWriter = new PhoenixMetricsSink(); Connection conn = getConnectionWithoutTracing(); - tableName = generateRandomString(); - pWriter.initForTesting(conn, tableName); + tracingTableName = "TRACING_" + generateRandomString(); + pWriter.initForTesting(conn, tracingTableName); sink = new DisableableMetricsWriter(pWriter); enabledForLoggingTable = "ENABLED_FOR_LOGGING_" + generateRandomString(); - enableForLoggingIndex = "ENABALED_FOR_LOGGING_INDEX" + generateRandomString(); + enableForLoggingIndex = "ENABALED_FOR_LOGGING_INDEX_" + generateRandomString(); - TracingTestUtil.registerSink(sink); + TracingTestUtil.registerSink(sink, tracingTableName); } @After public void cleanup() { sink.disable(); sink.clear(); + TracingTestUtil.unregisterSink(tracingTableName); } private void waitForCommit(CountDownLatch latch) throws SQLException { @@ -95,7 +96,7 @@ public class PhoenixTracingEndToEndIT extends BaseTracingTestIT { sink.disable(); // swap the connection for one that listens - sink.getDelegate().initForTesting(conn, tableName); + sink.getDelegate().initForTesting(conn, tracingTableName); // enable the writer sink.enable(); @@ -223,7 +224,7 @@ public class PhoenixTracingEndToEndIT extends BaseTracingTestIT { public boolean foundTrace(TraceHolder trace, SpanInfo span) { String traceInfo = trace.toString(); // skip logging traces that are just traces about tracing - if (traceInfo.contains(tableName)) { + if (traceInfo.contains(tracingTableName)) { return false; } return traceInfo.contains("Completing index"); @@ -247,7 +248,6 @@ public class PhoenixTracingEndToEndIT extends BaseTracingTestIT { // create an index on the table - we know indexing has some basic tracing ddl = "CREATE INDEX IF NOT EXISTS " + enableForLoggingIndex + " on " + enabledForLoggingTable + " (c1)"; conn.createStatement().execute(ddl); - conn.commit(); } @Test @@ -321,14 +321,12 @@ public class PhoenixTracingEndToEndIT extends BaseTracingTestIT { stmt.setLong(2, 1); stmt.execute(); conn.commit(); - conn.rollback(); // setup for next set of updates stmt.setString(1, "key2"); stmt.setLong(2, 2); stmt.execute(); conn.commit(); - conn.rollback(); // do a scan of the table String read = "SELECT COUNT(*) FROM " + enabledForLoggingTable; @@ -338,7 +336,7 @@ public class PhoenixTracingEndToEndIT extends BaseTracingTestIT { assertEquals("Didn't get the expected number of row", 2, results.getInt(1)); results.close(); - assertTrue("Get expected updates to trace table", updated.await(200, TimeUnit.SECONDS)); + assertTrue("Didn't get expected updates to trace table", updated.await(60, TimeUnit.SECONDS)); // don't trace reads either boolean found = checkStoredTraces(conn, new TraceChecker() { @Override @@ -461,7 +459,7 @@ public class PhoenixTracingEndToEndIT extends BaseTracingTestIT { } private boolean checkStoredTraces(Connection conn, TraceChecker checker) throws Exception { - TraceReader reader = new TraceReader(conn, tableName); + TraceReader reader = new TraceReader(conn, tracingTableName); int retries = 0; boolean found = false; outer: while (retries < MAX_RETRIES) { http://git-wip-us.apache.org/repos/asf/phoenix/blob/b4b76423/phoenix-core/src/it/java/org/apache/phoenix/trace/TracingTestUtil.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/trace/TracingTestUtil.java b/phoenix-core/src/it/java/org/apache/phoenix/trace/TracingTestUtil.java index b2b12f7..9c539c3 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/trace/TracingTestUtil.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/trace/TracingTestUtil.java @@ -25,7 +25,11 @@ import org.apache.phoenix.metrics.Metrics; */ public class TracingTestUtil { - public static void registerSink(MetricsSink sink){ - Metrics.initialize().register("phoenix", "test sink gets logged", sink); + public static void registerSink(MetricsSink sink, String name){ + Metrics.initialize().register(name, "test sink gets logged", sink); + } + + public static void unregisterSink(String name){ + Metrics.initialize().unregisterSource(name); } }