Updated Branches: refs/heads/master 49381c176 -> b6fcf7b4a
ACCUMULO-1215 tweak tests for stabilization Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b6fcf7b4 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b6fcf7b4 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b6fcf7b4 Branch: refs/heads/master Commit: b6fcf7b4a264b83693b345e4399fcf75c0cb1d56 Parents: 49381c1 Author: Eric Newton <[email protected]> Authored: Tue Sep 24 16:14:50 2013 -0400 Committer: Eric Newton <[email protected]> Committed: Tue Sep 24 16:14:50 2013 -0400 ---------------------------------------------------------------------- pom.xml | 5 ++--- .../test/java/org/apache/accumulo/test/ShellServerIT.java | 3 ++- .../apache/accumulo/test/functional/GarbageCollectorIT.java | 2 +- .../java/org/apache/accumulo/test/functional/MergeIT.java | 2 +- .../org/apache/accumulo/test/functional/ReadWriteIT.java | 2 +- .../org/apache/accumulo/test/functional/RestartStressIT.java | 8 +++++--- .../java/org/apache/accumulo/test/functional/ShutdownIT.java | 2 +- .../org/apache/accumulo/test/functional/WriteAheadLogIT.java | 7 ++++--- 8 files changed, 17 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/b6fcf7b4/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index ed17d48..62aa809 100644 --- a/pom.xml +++ b/pom.xml @@ -677,10 +677,9 @@ <configuration> <!--parallel>classes</parallel--> <reuseForks>false</reuseForks> - <forkMode>always</forkMode> - <forkCount>${accumulo.it.forkCount}</forkCount> + <forkMode>perthread</forkMode> <perCoreThreadCount>false</perCoreThreadCount> - <threadCount>${accumulo.it.threads}</threadCount> + <threadCount>${accumulo.it.forkCount}</threadCount> <redirectTestOutputToFile>true</redirectTestOutputToFile> </configuration> </execution> http://git-wip-us.apache.org/repos/asf/accumulo/blob/b6fcf7b4/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java b/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java index 60f1269..4fbd293 100644 --- a/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java +++ b/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java @@ -282,7 +282,8 @@ public class ShellServerIT { output.clear(); shell.execCommand("du -h", false, false); String o = output.get(); - assertTrue(o.matches(".*26[0-9]\\s\\[t\\]\\n")); // for some reason, there's 1-2 bytes of fluctuation + System.out.println("o " + o); + assertTrue(o.matches(".*[1-9][0-9][0-9]\\s\\[t\\]\\n")); exec("deletetable -f t"); } http://git-wip-us.apache.org/repos/asf/accumulo/blob/b6fcf7b4/test/src/test/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java b/test/src/test/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java index 217b978..06c86e6 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java @@ -102,7 +102,7 @@ public class GarbageCollectorIT extends ConfigurableMacIT { assertTrue(output.contains("delete candidates has exceeded")); } - @Test(timeout = 2 * 60 * 1000) + @Test(timeout = 4 * 60 * 1000) public void dontGCRootLog() throws Exception { // dirty !METADATA Connector c = getConnector(); http://git-wip-us.apache.org/repos/asf/accumulo/blob/b6fcf7b4/test/src/test/java/org/apache/accumulo/test/functional/MergeIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/MergeIT.java b/test/src/test/java/org/apache/accumulo/test/functional/MergeIT.java index 0d42382..2ae90ee 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/MergeIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/MergeIT.java @@ -99,7 +99,7 @@ public class MergeIT extends SimpleMacIT { return strings; } - @Test(timeout = 2 * 60 * 1000) + @Test(timeout = 4 * 60 * 1000) public void mergeTest() throws Exception { int tc = 0; Connector c = getConnector(); http://git-wip-us.apache.org/repos/asf/accumulo/blob/b6fcf7b4/test/src/test/java/org/apache/accumulo/test/functional/ReadWriteIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/ReadWriteIT.java b/test/src/test/java/org/apache/accumulo/test/functional/ReadWriteIT.java index 856f0c7..f5b3901 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/ReadWriteIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/ReadWriteIT.java @@ -59,7 +59,7 @@ public class ReadWriteIT extends ConfigurableMacIT { static final int COLS = 1; static final String COLF = "colf"; - @Test(timeout = 60 * 1000) + @Test(timeout = 2 * 60 * 1000) public void sunnyDay() throws Exception { // Start accumulo, create a table, insert some data, verify we can read it out. // Shutdown cleanly. http://git-wip-us.apache.org/repos/asf/accumulo/blob/b6fcf7b4/test/src/test/java/org/apache/accumulo/test/functional/RestartStressIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/RestartStressIT.java b/test/src/test/java/org/apache/accumulo/test/functional/RestartStressIT.java index 44d9332..28a0b19 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/RestartStressIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/RestartStressIT.java @@ -36,9 +36,11 @@ public class RestartStressIT extends ConfigurableMacIT { @Override public void configure(MiniAccumuloConfig cfg) { Map<String, String> opts = new HashMap<String, String>(); - opts.put(Property.TSERV_MAXMEM.getKey(), "5K"); + opts.put(Property.TSERV_MAXMEM.getKey(), "100K"); opts.put(Property.TSERV_MAJC_DELAY.getKey(), "100ms"); - opts.put(Property.TSERV_WALOG_MAX_SIZE.getKey(), "50K"); + opts.put(Property.TSERV_WALOG_MAX_SIZE.getKey(), "500K"); + opts.put(Property.INSTANCE_ZK_TIMEOUT.getKey(), "5s"); + opts.put(Property.MASTER_RECOVERY_DELAY.getKey(), "1s"); cfg.setSiteConfig(opts); cfg.useMiniDFS(true); } @@ -57,7 +59,7 @@ public class RestartStressIT extends ConfigurableMacIT { public void test() throws Exception { Connector c = getConnector(); c.tableOperations().create("test_ingest"); - c.tableOperations().setProperty("test_ingest", Property.TABLE_SPLIT_THRESHOLD.getKey(), "5K"); + c.tableOperations().setProperty("test_ingest", Property.TABLE_SPLIT_THRESHOLD.getKey(), "500K"); Process ingest = cluster.exec(TestIngest.class, "-u", "root", "-p", ROOT_PASSWORD, "-i", cluster.getInstanceName(), "-z", cluster.getZooKeepers(), http://git-wip-us.apache.org/repos/asf/accumulo/blob/b6fcf7b4/test/src/test/java/org/apache/accumulo/test/functional/ShutdownIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/ShutdownIT.java b/test/src/test/java/org/apache/accumulo/test/functional/ShutdownIT.java index b75cd93..d60eba6 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/ShutdownIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/ShutdownIT.java @@ -32,7 +32,7 @@ import org.junit.Test; public class ShutdownIT extends ConfigurableMacIT { - @Test(timeout = 3 * 60 * 1000) + @Test(timeout = 4 * 60 * 1000) public void shutdownDuringIngest() throws Exception { Process ingest = cluster.exec(TestIngest.class, "-i", cluster.getInstanceName(), "-z", cluster.getZooKeepers(), "-u", "root", "-p", ROOT_PASSWORD, "--createTable"); UtilWaitThread.sleep(100); http://git-wip-us.apache.org/repos/asf/accumulo/blob/b6fcf7b4/test/src/test/java/org/apache/accumulo/test/functional/WriteAheadLogIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/WriteAheadLogIT.java b/test/src/test/java/org/apache/accumulo/test/functional/WriteAheadLogIT.java index a798709..88030fa 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/WriteAheadLogIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/WriteAheadLogIT.java @@ -42,13 +42,14 @@ public class WriteAheadLogIT extends ConfigurableMacIT { siteConfig.put(Property.TSERV_WALOG_MAX_SIZE.getKey(), "2M"); siteConfig.put(Property.GC_CYCLE_DELAY.getKey(), "1"); siteConfig.put(Property.GC_CYCLE_START.getKey(), "1"); - siteConfig.put(Property.MASTER_RECOVERY_DELAY.getKey(), "0"); - siteConfig.put(Property.TSERV_MAXMEM.getKey(), "200K"); + siteConfig.put(Property.MASTER_RECOVERY_DELAY.getKey(), "1s"); siteConfig.put(Property.TSERV_MAJC_DELAY.getKey(), "1"); + siteConfig.put(Property.INSTANCE_ZK_TIMEOUT.getKey(), "1s"); + cfg.setSiteConfig(siteConfig); cfg.useMiniDFS(true); } - @Test(timeout = 4 * 60 * 1000) + @Test(timeout = 10 * 60 * 1000) public void test() throws Exception { Connector c = getConnector(); c.tableOperations().create("test_ingest");
