You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2014/08/25 19:47:49 UTC
[1/2] git commit: POM updates to control test fork behavior.
Repository: incubator-usergrid
Updated Branches:
refs/heads/two-dot-o 839ac295e -> 981f4afb3
POM updates to control test fork behavior.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/cc12bf65
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/cc12bf65
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/cc12bf65
Branch: refs/heads/two-dot-o
Commit: cc12bf659200015aa1aadc6d5459778ac8c7d967
Parents: 839ac29
Author: ryan bridges <rb...@apigee.com>
Authored: Mon Aug 25 10:53:02 2014 -0400
Committer: ryan bridges <rb...@apigee.com>
Committed: Mon Aug 25 10:55:07 2014 -0400
----------------------------------------------------------------------
stack/core/pom.xml | 14 ++++++----
stack/pom.xml | 10 ++++++-
stack/rest/pom.xml | 11 +++++---
stack/services/pom.xml | 28 +++++++++++++-------
.../usergrid/cassandra/CassandraMain.java | 2 +-
.../usergrid/cassandra/CassandraResource.java | 4 +--
6 files changed, 46 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/cc12bf65/stack/core/pom.xml
----------------------------------------------------------------------
diff --git a/stack/core/pom.xml b/stack/core/pom.xml
index b3a3949..caac9c5 100644
--- a/stack/core/pom.xml
+++ b/stack/core/pom.xml
@@ -26,7 +26,9 @@
<properties>
<!-- Up to 30x parallelism can be used -->
- <core.it.forkCount>1</core.it.forkCount>
+ <core.it.forkCount>3</core.it.forkCount>
+ <core.it.reuseForks>false</core.it.reuseForks>
+ <core.it.parallel>suites</core.it.parallel>
<core.it.suite.concurrency>1</core.it.suite.concurrency>
</properties>
@@ -63,10 +65,10 @@
<suite.concurrency>${core.it.suite.concurrency}</suite.concurrency>
</systemPropertyVariables>
- <parallel>both</parallel>
+ <parallel>${core.it.parallel}</parallel>
<forkCount>${core.it.forkCount}</forkCount>
- <reuseForks>false</reuseForks>
-
+ <reuseForks>${core.it.reuseForks}</reuseForks>
+
<argLine>-Xmx${ug.heapmax} -Xms${ug.heapmin} -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8 -javaagent:${settings.localRepository}/com/github/stephenc/jamm/0.2.5/jamm-0.2.5.jar
</argLine>
@@ -166,7 +168,9 @@
<storage-config>${basedir}/src/test/conf</storage-config>
<target.directory>${project.build.directory}</target.directory>
</systemPropertyVariables>
- <forkMode>once</forkMode>
+ <parallel>classes</parallel>
+ <forkCount>${core.it.forkCount}</forkCount>
+ <reuseForks>${core.it.reuseForks}</reuseForks>
<argLine>-Xmx${ug.heapmax} -Xms${ug.heapmin} -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8 -javaagent:${settings.localRepository}/com/github/stephenc/jamm/0.2.5/jamm-0.2.5.jar</argLine>
<includes>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/cc12bf65/stack/pom.xml
----------------------------------------------------------------------
diff --git a/stack/pom.xml b/stack/pom.xml
index e51da28..1a72339 100644
--- a/stack/pom.xml
+++ b/stack/pom.xml
@@ -85,7 +85,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<!-- you can override these via MAVEN_OPTS -->
- <ug.heapmax>1024m</ug.heapmax>
+ <ug.heapmax>4096m</ug.heapmax>
<ug.heapmin>1024m</ug.heapmin>
<usergrid-custom-spring-properties>classpath:/usergrid-custom.properties</usergrid-custom-spring-properties>
@@ -116,6 +116,10 @@
<tika.version>1.4</tika.version>
<elasticsearch.version>1.2.3</elasticsearch.version>
+ <usergrid.it.forkCount>3</usergrid.it.forkCount>
+ <usergrid.it.reuseForks>false</usergrid.it.reuseForks>
+ <usergrid.it.parallel>suites</usergrid.it.parallel>
+
</properties>
<licenses>
@@ -1656,6 +1660,10 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>2.15</version>
<configuration>
+ <parallel>${usergrid.it.parallel}</parallel>
+ <forkCount>${usergrid.it.forkCount}</forkCount>
+ <reuseForks>${usergrid.it.reuseForks}</reuseForks>
+
<argLine>-Xmx${ug.heapmax} -Xms${ug.heapmin} -javaagent:${settings.localRepository}/com/github/stephenc/jamm/0.2.5/jamm-0.2.5.jar</argLine>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/cc12bf65/stack/rest/pom.xml
----------------------------------------------------------------------
diff --git a/stack/rest/pom.xml b/stack/rest/pom.xml
index adaf848..848c5c4 100644
--- a/stack/rest/pom.xml
+++ b/stack/rest/pom.xml
@@ -33,7 +33,8 @@
<properties>
<!-- If you got the resources, max parallelism = 6 forks -->
<rest.it.forkCount>1</rest.it.forkCount>
- <core.it.suite.concurrency>1</core.it.suite.concurrency>
+ <rest.it.reuseForks>false</rest.it.reuseForks>
+ <rest.it.parallel>suites</rest.it.parallel>
</properties>
<profiles>
@@ -56,10 +57,9 @@
</systemPropertyVariables>
<forkCount>${rest.it.forkCount}</forkCount>
- <reuseForks>false</reuseForks>
+ <reuseForks>${rest.it.reuseForks}</reuseForks>
- <parallel>false</parallel>
- <perCoreThreadCount>false</perCoreThreadCount>
+ <parallel>${rest.it.parallel}</parallel>
<argLine>-Xmx${ug.heapmax} -Xms${ug.heapmin} -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8 -javaagent:${settings.localRepository}/com/github/stephenc/jamm/0.2.5/jamm-0.2.5.jar -Djava.util.logging.config.file=src/test/resources/logging.properties</argLine>
@@ -130,6 +130,9 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
+ <parallel>${rest.it.parallel}</parallel>
+ <forkCount>${rest.it.forkCount}</forkCount>
+ <reuseForks>${rest.it.reuseForks}</reuseForks>
<argLine>-Xmx${ug.heapmax} -Xms${ug.heapmin} -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8 -javaagent:${settings.localRepository}/com/github/stephenc/jamm/0.2.5/jamm-0.2.5.jar</argLine>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/cc12bf65/stack/services/pom.xml
----------------------------------------------------------------------
diff --git a/stack/services/pom.xml b/stack/services/pom.xml
index 3d81558..08e8f59 100644
--- a/stack/services/pom.xml
+++ b/stack/services/pom.xml
@@ -26,7 +26,9 @@
<!-- Override these properties in your settings.xml in an active profile -->
<properties>
- <services.it.forkCount>2</services.it.forkCount>
+ <services.it.forkCount>3</services.it.forkCount>
+ <services.it.reuseForks>true</services.it.reuseForks>
+ <services.it.parallel>suites</services.it.parallel>
</properties>
<artifactId>usergrid-services</artifactId>
@@ -63,7 +65,9 @@
<storage-config>${basedir}/src/test/conf</storage-config>
<target.directory>${project.build.directory}</target.directory>
</systemPropertyVariables>
- <forkMode>once</forkMode>
+ <parallel>${services.it.parallel}</parallel>
+ <forkCount>${services.it.forkCount}</forkCount>
+ <reuseForks>${services.it.reuseForks}</reuseForks>
<!-- TODO: make this into a small configuration but based on settings.xml -->
<argLine>-Xmx${ug.heapmax} -Xms${ug.heapmin} -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8 -javaagent:${settings.localRepository}/com/github/stephenc/jamm/0.2.5/jamm-0.2.5.jar</argLine>
@@ -100,9 +104,9 @@
<target.directory>${project.build.directory}</target.directory>
</systemPropertyVariables>
- <parallel>both</parallel>
- <forkCount>${services.it.forkCount}</forkCount>
- <reuseForks>false</reuseForks>
+ <parallel>${services.it.parallel}</parallel>
+ <forkCount>${services.it.forkCount}</forkCount>
+ <reuseForks>${services.it.reuseForks}</reuseForks>
<argLine>-Xmx${ug.heapmax} -Xms${ug.heapmin} -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8</argLine>
<argLine>
@@ -164,7 +168,9 @@
<storage-config>${basedir}/src/test/conf</storage-config>
<target.directory>${project.build.directory}</target.directory>
</systemPropertyVariables>
- <forkMode>once</forkMode>
+ <parallel>${services.it.parallel}</parallel>
+ <forkCount>${services.it.forkCount}</forkCount>
+ <reuseForks>${services.it.reuseForks}</reuseForks>
<argLine>-Xmx${ug.heapmax} -Xms${ug.heapmin} -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8</argLine>
<argLine>
<!-- -javaagent:${settings.localRepository}/org/powermock/powermock-module-javaagent/1.5.1/powermock-module-javaagent-1.5.1.jar-->
@@ -206,7 +212,9 @@
<storage-config>${basedir}/src/test/conf</storage-config>
<target.directory>${project.build.directory}</target.directory>
</systemPropertyVariables>
- <forkMode>once</forkMode>
+ <parallel>${services.it.parallel}</parallel>
+ <forkCount>${services.it.forkCount}</forkCount>
+ <reuseForks>${services.it.reuseForks}</reuseForks>
<argLine>-Xmx${ug.heapmax} -Xms${ug.heapmin} -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8</argLine>
<argLine>
<!-- -javaagent:${settings.localRepository}/org/powermock/powermock-module-javaagent/1.5.1/powermock-module-javaagent-1.5.1.jar -->
@@ -269,9 +277,9 @@
<target.directory>${project.build.directory}</target.directory>
</systemPropertyVariables>
- <parallel>both</parallel>
- <forkCount>${services.it.forkCount}</forkCount>
- <reuseForks>false</reuseForks>
+ <parallel>${services.it.parallel}</parallel>
+ <forkCount>${services.it.forkCount}</forkCount>
+ <reuseForks>${services.it.reuseForks}</reuseForks>
<argLine>-Xmx${ug.heapmax} -Xms${ug.heapmin} -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8</argLine>
<argLine>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/cc12bf65/stack/test-utils/src/main/java/org/apache/usergrid/cassandra/CassandraMain.java
----------------------------------------------------------------------
diff --git a/stack/test-utils/src/main/java/org/apache/usergrid/cassandra/CassandraMain.java b/stack/test-utils/src/main/java/org/apache/usergrid/cassandra/CassandraMain.java
index fc7d1bc..3ca6d20 100644
--- a/stack/test-utils/src/main/java/org/apache/usergrid/cassandra/CassandraMain.java
+++ b/stack/test-utils/src/main/java/org/apache/usergrid/cassandra/CassandraMain.java
@@ -56,7 +56,7 @@ public class CassandraMain {
System.setProperty( "cassandra.tempName", tmpDirName );
LOG.info("Starting forked Cassandra: test, setting system properties for ports : "
- + "[rpc, storage, sslStoage, native] = [{}, {}, {}, {}]",
+ + "[rpc, storage, sslStorage, native] = [{}, {}, {}, {}]",
new Object[] {rpcPort, storagePort, sslStoragePort, nativeTransportPort});
CassandraDaemon cassandraDaemon = new CassandraDaemon();
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/cc12bf65/stack/test-utils/src/main/java/org/apache/usergrid/cassandra/CassandraResource.java
----------------------------------------------------------------------
diff --git a/stack/test-utils/src/main/java/org/apache/usergrid/cassandra/CassandraResource.java b/stack/test-utils/src/main/java/org/apache/usergrid/cassandra/CassandraResource.java
index 3813e8e..96d0d74 100644
--- a/stack/test-utils/src/main/java/org/apache/usergrid/cassandra/CassandraResource.java
+++ b/stack/test-utils/src/main/java/org/apache/usergrid/cassandra/CassandraResource.java
@@ -357,7 +357,7 @@ public class CassandraResource extends ExternalResource {
System.setProperty( "cassandra." + NATIVE_TRANSPORT_PORT_KEY, Integer.toString( nativeTransportPort ) );
LOG.info("before() test, setting system properties for ports : "
- + "[rpc, storage, sslStoage, native] = [{}, {}, {}, {}]",
+ + "[rpc, storage, sslStorage, native] = [{}, {}, {}, {}]",
new Object[] {rpcPort, storagePort, sslStoragePort, nativeTransportPort});
if ( !newYamlFile.exists() ) {
throw new RuntimeException( "Cannot find new Yaml file: " + newYamlFile );
@@ -443,7 +443,7 @@ public class CassandraResource extends ExternalResource {
System.setProperty( "cassandra." + NATIVE_TRANSPORT_PORT_KEY, Integer.toString( nativeTransportPort ) );
LOG.info("before() test, setting system properties for ports : "
- + "[rpc, storage, sslStoage, native] = [{}, {}, {}, {}]",
+ + "[rpc, storage, sslStorage, native] = [{}, {}, {}, {}]",
new Object[] {rpcPort, storagePort, sslStoragePort, nativeTransportPort});
if ( !newYamlFile.exists() ) {
[2/2] git commit: setting the max heap back to 1024m
Posted by sn...@apache.org.
setting the max heap back to 1024m
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/981f4afb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/981f4afb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/981f4afb
Branch: refs/heads/two-dot-o
Commit: 981f4afb3f8bff17bc790a1644788b67e57abec4
Parents: cc12bf6
Author: ryan bridges <rb...@apigee.com>
Authored: Mon Aug 25 11:02:26 2014 -0400
Committer: ryan bridges <rb...@apigee.com>
Committed: Mon Aug 25 11:02:26 2014 -0400
----------------------------------------------------------------------
stack/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/981f4afb/stack/pom.xml
----------------------------------------------------------------------
diff --git a/stack/pom.xml b/stack/pom.xml
index 1a72339..0ff39ae 100644
--- a/stack/pom.xml
+++ b/stack/pom.xml
@@ -85,7 +85,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<!-- you can override these via MAVEN_OPTS -->
- <ug.heapmax>4096m</ug.heapmax>
+ <ug.heapmax>1024m</ug.heapmax>
<ug.heapmin>1024m</ug.heapmin>
<usergrid-custom-spring-properties>classpath:/usergrid-custom.properties</usergrid-custom-spring-properties>