You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sf...@apache.org on 2015/02/25 18:08:47 UTC
[02/11] incubator-usergrid git commit: Adding some JVM options to
help with the OOM PermGen problems,
and removing all tests from except for one (for now)
Adding some JVM options to help with the OOM PermGen problems, and removing all tests from except for one (for now)
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/35bff549
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/35bff549
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/35bff549
Branch: refs/heads/USERGRID-273-indexbuffer
Commit: 35bff549b0df8147bd7b8ee007c9303a08a06502
Parents: c9198a6
Author: Dave Johnson <dm...@apigee.com>
Authored: Tue Feb 24 10:37:37 2015 -0500
Committer: Dave Johnson <dm...@apigee.com>
Committed: Tue Feb 24 10:37:37 2015 -0500
----------------------------------------------------------------------
stack/rest/catalina_base/bin/setenv.sh | 3 +--
stack/rest/pom.xml | 19 +++++++++++++++++--
2 files changed, 18 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/35bff549/stack/rest/catalina_base/bin/setenv.sh
----------------------------------------------------------------------
diff --git a/stack/rest/catalina_base/bin/setenv.sh b/stack/rest/catalina_base/bin/setenv.sh
index dbcad13..ab2f736 100644
--- a/stack/rest/catalina_base/bin/setenv.sh
+++ b/stack/rest/catalina_base/bin/setenv.sh
@@ -3,7 +3,6 @@ JAVA_OPTS="$JAVA_OPTS -Dcom.sun.management.jmxremote.port=8089 "
JAVA_OPTS="$JAVA_OPTS -Dcom.sun.management.jmxremote.ssl=false "
JAVA_OPTS="$JAVA_OPTS -Dcom.sun.management.jmxremote.authenticate=false"
JAVA_OPTS="$JAVA_OPTS -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8000"
-JAVA_OPTS="$JAVA_OPTS -Xmx4000m -Xms4000m"
+JAVA_OPTS="$JAVA_OPTS -Xmx3000m -Xms1000m -XX:MaxPermSize=200m -XX:+CMSClassUnloadingEnabled -XX:+CMSPermGenSweepingEnabled"
CATALINA_PID="$CATALINA_BASE/tomcat.pid"
-
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/35bff549/stack/rest/pom.xml
----------------------------------------------------------------------
diff --git a/stack/rest/pom.xml b/stack/rest/pom.xml
index b3c3663..2959d6c 100644
--- a/stack/rest/pom.xml
+++ b/stack/rest/pom.xml
@@ -151,8 +151,23 @@
<argLine>-Dtest.barrier.timestamp=${maven.build.timestamp} -Dtest.clean.storage=true -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 ${ug.argline}
</argLine>
<includes>
- <include>**/*IT.java</include>
- <include>**/*Test.java</include>
+
+ <!--<include>**/*IT.java</include>-->
+ <!--<include>**/*Test.java</include>-->
+
+ <!-- how many tests can we run before Tomcat JVM throws OOM / PermGen exceptions -->
+
+ <include>**/org/apache/usergrid/rest/BasicIT.java</include>
+
+ <!--<include>**/org/apache/usergrid/rest/*IT.java</include>-->
+ <!--<include>**/org/apache/usergrid/rest/*Test.java</include>-->
+
+ <!--<include>**/org/apache/usergrid/rest/management/**/*IT.java</include>-->
+ <!--<include>**/org/apache/usergrid/rest/management/**/*Test.java</include>-->
+
+ <!--<include>**/org/apache/usergrid/rest/applications/collection/**/*IT.java</include>-->
+ <!--<include>**/org/apache/usergrid/rest/applications/collection/**/*Test.java</include>-->
+
</includes>
</configuration>