You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2013/08/09 16:44:06 UTC
git commit: ACCUMULO-1537 got IT tests to run on a slow vm
Updated Branches:
refs/heads/master d0fe7e60a -> 6591b4e94
ACCUMULO-1537 got IT tests to run on a slow vm
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6591b4e9
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6591b4e9
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6591b4e9
Branch: refs/heads/master
Commit: 6591b4e94ef288a0e1219a4f3333531b752a658a
Parents: d0fe7e6
Author: Eric Newton <er...@gmail.com>
Authored: Fri Aug 9 10:42:14 2013 -0400
Committer: Eric Newton <er...@gmail.com>
Committed: Fri Aug 9 10:43:45 2013 -0400
----------------------------------------------------------------------
.../org/apache/accumulo/minicluster/MiniAccumuloCluster.java | 5 ++---
pom.xml | 3 +++
.../test/java/org/apache/accumulo/test/functional/BulkIT.java | 3 ++-
.../org/apache/accumulo/test/functional/ConfigurableMacIT.java | 3 ++-
.../accumulo/test/functional/SimpleBalancerFairnessIT.java | 2 +-
.../java/org/apache/accumulo/test/functional/SimpleMacIT.java | 6 ------
.../java/org/apache/accumulo/test/functional/WriteLotsIT.java | 2 +-
7 files changed, 11 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6591b4e9/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java
----------------------------------------------------------------------
diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java b/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java
index fd28a62..7c27dd8 100644
--- a/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java
+++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java
@@ -271,11 +271,11 @@ public class MiniAccumuloCluster {
// zookeeper uses Properties to read its config, so use that to write in order to properly escape things like Windows paths
Properties zooCfg = new Properties();
- zooCfg.setProperty("tickTime", "1000");
+ zooCfg.setProperty("tickTime", "2000");
zooCfg.setProperty("initLimit", "10");
zooCfg.setProperty("syncLimit", "5");
zooCfg.setProperty("clientPort", config.getZooKeeperPort() + "");
- zooCfg.setProperty("maxClientCnxns", "100");
+ zooCfg.setProperty("maxClientCnxns", "1000");
zooCfg.setProperty("dataDir", config.getZooKeeperDir().getAbsolutePath());
zooCfg.store(fileWriter, null);
@@ -466,7 +466,6 @@ public class MiniAccumuloCluster {
for (Process p : cleanup)
p.destroy();
miniDFS = null;
- Runtime.getRuntime().exec("pkill -f " + config.getDir().getAbsolutePath());
}
/**
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6591b4e9/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8116876..8ee98e6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -675,6 +675,9 @@
</goals>
<configuration>
<!--parallel>classes</parallel-->
+ <reuseForks>false</reuseForks>
+ <forkMode>always</forkMode>
+ <forkCount>8</forkCount>
<perCoreThreadCount>false</perCoreThreadCount>
<threadCount>${accumulo.it.threads}</threadCount>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6591b4e9/test/src/test/java/org/apache/accumulo/test/functional/BulkIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/BulkIT.java b/test/src/test/java/org/apache/accumulo/test/functional/BulkIT.java
index e239c32..a81bb0d 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/BulkIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/BulkIT.java
@@ -37,7 +37,8 @@ public class BulkIT extends SimpleMacIT {
c.tableOperations().create(tableName);
FileSystem fs = FileSystem.get(CachedConfiguration.getInstance());
String base = "target/accumulo-maven-plugin";
- fs.mkdirs(new Path("target/accumulo-maven-plugin/testBulkFail"));
+ fs.delete(new Path(base + "/testrf"));
+ fs.mkdirs(new Path(base + "/testBulkFail"));
Opts opts = new Opts();
opts.timestamp = 1;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6591b4e9/test/src/test/java/org/apache/accumulo/test/functional/ConfigurableMacIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/ConfigurableMacIT.java b/test/src/test/java/org/apache/accumulo/test/functional/ConfigurableMacIT.java
index 8c02a35..c34fff5 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/ConfigurableMacIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/ConfigurableMacIT.java
@@ -22,11 +22,12 @@ import org.apache.log4j.Logger;
import org.junit.After;
import org.junit.Before;
import org.junit.rules.TemporaryFolder;
+import java.io.File;
public class ConfigurableMacIT extends AbstractMacIT {
public static final Logger log = Logger.getLogger(ConfigurableMacIT.class);
- public TemporaryFolder folder = new TemporaryFolder();
+ public TemporaryFolder folder = new TemporaryFolder(new File(System.getProperty("user.dir") + "/target"));
public MiniAccumuloCluster cluster;
@Before
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6591b4e9/test/src/test/java/org/apache/accumulo/test/functional/SimpleBalancerFairnessIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/SimpleBalancerFairnessIT.java b/test/src/test/java/org/apache/accumulo/test/functional/SimpleBalancerFairnessIT.java
index f04ac78..7a9bad6 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/SimpleBalancerFairnessIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/SimpleBalancerFairnessIT.java
@@ -49,7 +49,7 @@ public class SimpleBalancerFairnessIT extends ConfigurableMacIT {
cfg.setSiteConfig(siteConfig);
}
- @Test(timeout = 4 * 60 * 1000)
+ @Test(timeout = 6 * 60 * 1000)
public void simpleBalancerFairness() throws Exception {
Connector c = getConnector();
c.tableOperations().create("test_ingest");
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6591b4e9/test/src/test/java/org/apache/accumulo/test/functional/SimpleMacIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/SimpleMacIT.java b/test/src/test/java/org/apache/accumulo/test/functional/SimpleMacIT.java
index 75c2ea1..aa47a8a 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/SimpleMacIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/SimpleMacIT.java
@@ -56,12 +56,6 @@ public class SimpleMacIT extends AbstractMacIT {
@After
public void cleanUp() throws Exception {
- Connector c = getConnector();
- for (String table : c.tableOperations().list()) {
- if (table.equals(MetadataTable.NAME) || table.equals(RootTable.NAME))
- continue;
- c.tableOperations().delete(table);
- }
}
@AfterClass
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6591b4e9/test/src/test/java/org/apache/accumulo/test/functional/WriteLotsIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/WriteLotsIT.java b/test/src/test/java/org/apache/accumulo/test/functional/WriteLotsIT.java
index 5571a09..f713474 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/WriteLotsIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/WriteLotsIT.java
@@ -29,7 +29,7 @@ import org.junit.Test;
public class WriteLotsIT extends SimpleMacIT {
- @Test(timeout = 20 * 1000)
+ @Test(timeout = 60 * 1000)
public void writeLots() throws Exception {
final Connector c = getConnector();
final String tableName = makeTableName();