ACCUMULO-3167 Only try to start the trace process for MAC
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7e52f7b4 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7e52f7b4 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7e52f7b4 Branch: refs/heads/metrics2 Commit: 7e52f7b4d1facea35e25855a7758f8d2899ce1ad Parents: 7a020e5 Author: Josh Elser <[email protected]> Authored: Thu Nov 20 23:05:37 2014 -0500 Committer: Josh Elser <[email protected]> Committed: Mon Nov 24 18:08:17 2014 -0500 ---------------------------------------------------------------------- .../java/org/apache/accumulo/test/ConditionalWriterIT.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/7e52f7b4/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java b/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java index c8c7494..50185b8 100644 --- a/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java +++ b/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java @@ -87,6 +87,7 @@ import org.apache.accumulo.tracer.TraceServer; import org.apache.hadoop.io.Text; import org.apache.log4j.Logger; import org.junit.Assert; +import org.junit.Assume; import org.junit.Test; import com.google.common.collect.Iterables; @@ -1237,12 +1238,13 @@ public class ConditionalWriterIT extends AccumuloClusterIT { Process tracer = null; Connector conn = getConnector(); if (!conn.tableOperations().exists("trace")) { + Assume.assumeTrue(getClusterType() == ClusterType.MINI); AccumuloCluster cluster = getCluster(); MiniAccumuloClusterImpl mac = (MiniAccumuloClusterImpl) cluster; tracer = mac.exec(TraceServer.class); - } - while (!conn.tableOperations().exists("trace")) { - UtilWaitThread.sleep(1000); + while (!conn.tableOperations().exists("trace")) { + UtilWaitThread.sleep(1000); + } } String tableName = getUniqueNames(1)[0];
