Repository: accumulo Updated Branches: refs/heads/master 1dd6b704a -> 3e5acd5b5
ACCUMULO-3929 ignore performance-related ITs in the wild-west environment that is map-reduce Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/eb4c38f5 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/eb4c38f5 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/eb4c38f5 Branch: refs/heads/master Commit: eb4c38f50eeac1809def18167d29b6d16de4bb81 Parents: c088a85 Author: Eric C. Newton <eric.new...@gmail.com> Authored: Mon Jul 6 10:27:39 2015 -0400 Committer: Eric C. Newton <eric.new...@gmail.com> Committed: Mon Jul 6 10:27:39 2015 -0400 ---------------------------------------------------------------------- .../org/apache/accumulo/test/BalanceFasterIT.java | 10 ++++++++++ .../java/org/apache/accumulo/test/ManySplitIT.java | 17 +++++++++++++---- .../accumulo/test/functional/DurabilityIT.java | 8 ++++++++ .../test/mrit/IntegrationTestMapReduce.java | 6 ++++++ .../test/performance/RollWALPerformanceIT.java | 8 ++++++++ .../performance/metadata/FastBulkImportIT.java | 9 +++++++++ 6 files changed, 54 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/eb4c38f5/test/src/main/java/org/apache/accumulo/test/BalanceFasterIT.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/BalanceFasterIT.java b/test/src/main/java/org/apache/accumulo/test/BalanceFasterIT.java index bf9f5f0..4418fe7 100644 --- a/test/src/main/java/org/apache/accumulo/test/BalanceFasterIT.java +++ b/test/src/main/java/org/apache/accumulo/test/BalanceFasterIT.java @@ -17,6 +17,7 @@ package org.apache.accumulo.test; import static org.junit.Assert.assertTrue; +import static org.junit.Assume.assumeFalse; import java.util.HashMap; import java.util.Iterator; @@ -35,18 +36,27 @@ import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.core.util.UtilWaitThread; import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl; import org.apache.accumulo.test.functional.ConfigurableMacBase; +import org.apache.accumulo.test.mrit.IntegrationTestMapReduce; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.Text; +import org.junit.BeforeClass; import org.junit.Test; // ACCUMULO-2952 public class BalanceFasterIT extends ConfigurableMacBase { + + @Override public void configure(MiniAccumuloConfigImpl cfg, Configuration hadoopCoreSite) { cfg.setNumTservers(3); } + @BeforeClass + static public void checkMR() { + assumeFalse(IntegrationTestMapReduce.isMapReduce()); + } + @Test(timeout = 90 * 1000) public void test() throws Exception { // create a table, add a bunch of splits http://git-wip-us.apache.org/repos/asf/accumulo/blob/eb4c38f5/test/src/main/java/org/apache/accumulo/test/ManySplitIT.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/ManySplitIT.java b/test/src/main/java/org/apache/accumulo/test/ManySplitIT.java index dc61f53..f1a3868 100644 --- a/test/src/main/java/org/apache/accumulo/test/ManySplitIT.java +++ b/test/src/main/java/org/apache/accumulo/test/ManySplitIT.java @@ -18,6 +18,7 @@ package org.apache.accumulo.test; import static java.nio.charset.StandardCharsets.UTF_8; import static org.junit.Assert.assertTrue; +import static org.junit.Assume.assumeFalse; import java.util.SortedSet; import java.util.TreeSet; @@ -33,17 +34,25 @@ import org.apache.accumulo.minicluster.MemoryUnit; import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl; import org.apache.accumulo.test.functional.ConfigurableMacBase; +import org.apache.accumulo.test.mrit.IntegrationTestMapReduce; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.Text; +import org.junit.BeforeClass; import org.junit.Test; - public class ManySplitIT extends ConfigurableMacBase { final int SPLITS = 10_000; - @Test(timeout = 2 * 60 * 1000) + @BeforeClass + static public void checkMR() { + assumeFalse(IntegrationTestMapReduce.isMapReduce()); + } + + @Test(timeout = 4 * 60 * 1000) public void test() throws Exception { + assumeFalse(IntegrationTestMapReduce.isMapReduce()); + final String tableName = getUniqueNames(1)[0]; log.info("Creating table"); @@ -53,7 +62,7 @@ public class ManySplitIT extends ConfigurableMacBase { tableOperations.create(tableName); SortedSet<Text> splits = new TreeSet<Text>(); for (byte b : "123456789abcde".getBytes(UTF_8)) { - splits.add(new Text(new byte[]{'1', ';', b})); + splits.add(new Text(new byte[] {'1', ';', b})); } tableOperations.addSplits(MetadataTable.NAME, splits); splits.clear(); @@ -69,7 +78,7 @@ public class ManySplitIT extends ConfigurableMacBase { while (!stop.get()) { UtilWaitThread.sleep(1000); try { - log.info("splits: " + tableOperations.listSplits(tableName).size() ); + log.info("splits: " + tableOperations.listSplits(tableName).size()); } catch (TableNotFoundException | AccumuloException | AccumuloSecurityException e) { // TODO Auto-generated catch block e.printStackTrace(); http://git-wip-us.apache.org/repos/asf/accumulo/blob/eb4c38f5/test/src/main/java/org/apache/accumulo/test/functional/DurabilityIT.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/functional/DurabilityIT.java b/test/src/main/java/org/apache/accumulo/test/functional/DurabilityIT.java index 49e004f..5c2508e 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/DurabilityIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/DurabilityIT.java @@ -18,6 +18,7 @@ package org.apache.accumulo.test.functional; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; +import static org.junit.Assume.assumeFalse; import java.util.Arrays; import java.util.HashMap; @@ -34,8 +35,10 @@ import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl; import org.apache.accumulo.minicluster.impl.ProcessReference; +import org.apache.accumulo.test.mrit.IntegrationTestMapReduce; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.RawLocalFileSystem; +import org.junit.BeforeClass; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -52,6 +55,11 @@ public class DurabilityIT extends ConfigurableMacBase { cfg.setNumTservers(1); } + @BeforeClass + static public void checkMR() { + assumeFalse(IntegrationTestMapReduce.isMapReduce()); + } + static final long N = 100000; private String[] init() throws Exception { http://git-wip-us.apache.org/repos/asf/accumulo/blob/eb4c38f5/test/src/main/java/org/apache/accumulo/test/mrit/IntegrationTestMapReduce.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/mrit/IntegrationTestMapReduce.java b/test/src/main/java/org/apache/accumulo/test/mrit/IntegrationTestMapReduce.java index 7e76be1..7ecf02a 100644 --- a/test/src/main/java/org/apache/accumulo/test/mrit/IntegrationTestMapReduce.java +++ b/test/src/main/java/org/apache/accumulo/test/mrit/IntegrationTestMapReduce.java @@ -74,6 +74,12 @@ public class IntegrationTestMapReduce extends Configured implements Tool { private static final Logger log = LoggerFactory.getLogger(IntegrationTestMapReduce.class); + private static boolean isMapReduce = false; + + public static boolean isMapReduce() { + return isMapReduce; + } + public static class TestMapper extends Mapper<LongWritable,Text,Text,Text> { static final Text FAIL = new Text("FAIL"); http://git-wip-us.apache.org/repos/asf/accumulo/blob/eb4c38f5/test/src/main/java/org/apache/accumulo/test/performance/RollWALPerformanceIT.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/performance/RollWALPerformanceIT.java b/test/src/main/java/org/apache/accumulo/test/performance/RollWALPerformanceIT.java index bd42989..db0e1a3 100644 --- a/test/src/main/java/org/apache/accumulo/test/performance/RollWALPerformanceIT.java +++ b/test/src/main/java/org/apache/accumulo/test/performance/RollWALPerformanceIT.java @@ -17,6 +17,7 @@ package org.apache.accumulo.test.performance; import static org.junit.Assert.assertTrue; +import static org.junit.Assume.assumeFalse; import java.util.SortedSet; import java.util.TreeSet; @@ -30,12 +31,19 @@ import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl; import org.apache.accumulo.test.continuous.ContinuousIngest; import org.apache.accumulo.test.functional.ConfigurableMacBase; +import org.apache.accumulo.test.mrit.IntegrationTestMapReduce; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.Text; +import org.junit.BeforeClass; import org.junit.Test; public class RollWALPerformanceIT extends ConfigurableMacBase { + @BeforeClass + static public void checkMR() { + assumeFalse(IntegrationTestMapReduce.isMapReduce()); + } + @Override protected void configure(MiniAccumuloConfigImpl cfg, Configuration hadoopCoreSite) { cfg.setProperty(Property.TSERV_WAL_REPLICATION, "1"); http://git-wip-us.apache.org/repos/asf/accumulo/blob/eb4c38f5/test/src/main/java/org/apache/accumulo/test/performance/metadata/FastBulkImportIT.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/performance/metadata/FastBulkImportIT.java b/test/src/main/java/org/apache/accumulo/test/performance/metadata/FastBulkImportIT.java index 236522a..1c94ff8 100644 --- a/test/src/main/java/org/apache/accumulo/test/performance/metadata/FastBulkImportIT.java +++ b/test/src/main/java/org/apache/accumulo/test/performance/metadata/FastBulkImportIT.java @@ -17,6 +17,7 @@ package org.apache.accumulo.test.performance.metadata; import static org.junit.Assert.assertTrue; +import static org.junit.Assume.assumeFalse; import java.util.SortedSet; import java.util.TreeSet; @@ -32,15 +33,22 @@ import org.apache.accumulo.core.file.rfile.RFile; import org.apache.accumulo.core.util.CachedConfiguration; import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl; import org.apache.accumulo.test.functional.ConfigurableMacBase; +import org.apache.accumulo.test.mrit.IntegrationTestMapReduce; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.io.Text; +import org.junit.BeforeClass; import org.junit.Test; // ACCUMULO-3327 public class FastBulkImportIT extends ConfigurableMacBase { + @BeforeClass + static public void checkMR() { + assumeFalse(IntegrationTestMapReduce.isMapReduce()); + } + @Override protected int defaultTimeoutSeconds() { return 60; @@ -53,6 +61,7 @@ public class FastBulkImportIT extends ConfigurableMacBase { cfg.setProperty(Property.TSERV_BULK_PROCESS_THREADS, "5"); cfg.setProperty(Property.TABLE_MAJC_RATIO, "9999"); cfg.setProperty(Property.TABLE_FILE_MAX, "9999"); + cfg.setProperty(Property.TABLE_DURABILITY, "none"); } @Test
