Updated Branches: refs/heads/4.1 87bb4dbff -> 2bbbe0909
Summary: Increase tomcat servers memory size per dev list discussion Detail: Per Kelven Yang when Javelin was merged into master/4.1, the memory settings for management server should be a heap of 2g and a max perm size of 512m, due to increased footprint introduced by spring framework/Javelin. Signed-off-by: Marcus Sorensen <mar...@betterservers.com> 1361311099 -0700 Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/2bbbe090 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/2bbbe090 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/2bbbe090 Branch: refs/heads/4.1 Commit: 2bbbe090988b2c0910f4d6ffa5e0d9590b42306d Parents: 87bb4db Author: Marcus Sorensen <mar...@betterservers.com> Authored: Tue Feb 19 14:58:19 2013 -0700 Committer: Marcus Sorensen <mar...@betterservers.com> Committed: Tue Feb 19 14:58:19 2013 -0700 ---------------------------------------------------------------------- client/tomcatconf/tomcat6-nonssl.conf.in | 2 +- client/tomcatconf/tomcat6-ssl.conf.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/2bbbe090/client/tomcatconf/tomcat6-nonssl.conf.in ---------------------------------------------------------------------- diff --git a/client/tomcatconf/tomcat6-nonssl.conf.in b/client/tomcatconf/tomcat6-nonssl.conf.in index d69d6ed..8b7a23d 100644 --- a/client/tomcatconf/tomcat6-nonssl.conf.in +++ b/client/tomcatconf/tomcat6-nonssl.conf.in @@ -41,7 +41,7 @@ CATALINA_TMPDIR="@MSENVIRON@/temp" # Use JAVA_OPTS to set java.library.path for libtcnative.so #JAVA_OPTS="-Djava.library.path=/usr/lib64" -JAVA_OPTS="-Djava.awt.headless=true -Dcom.sun.management.jmxremote.port=45219 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Xmx1024m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=@MSLOGDIR@ -XX:PermSize=256M" +JAVA_OPTS="-Djava.awt.headless=true -Dcom.sun.management.jmxremote.port=45219 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Xmx2g -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=@MSLOGDIR@ -XX:PermSize=256M -XX:MaxPermSize=512m" # What user should run tomcat TOMCAT_USER="@MSUSER@" http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/2bbbe090/client/tomcatconf/tomcat6-ssl.conf.in ---------------------------------------------------------------------- diff --git a/client/tomcatconf/tomcat6-ssl.conf.in b/client/tomcatconf/tomcat6-ssl.conf.in index ecb93b2..c6cdf27 100644 --- a/client/tomcatconf/tomcat6-ssl.conf.in +++ b/client/tomcatconf/tomcat6-ssl.conf.in @@ -40,7 +40,7 @@ CATALINA_TMPDIR="@MSENVIRON@/temp" # Use JAVA_OPTS to set java.library.path for libtcnative.so #JAVA_OPTS="-Djava.library.path=/usr/lib64" -JAVA_OPTS="-Djava.awt.headless=true -Djavax.net.ssl.trustStore=/etc/cloud/management/cloudmanagementserver.keystore -Djavax.net.ssl.trustStorePassword=vmops.com -Dcom.sun.management.jmxremote.port=45219 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Xmx1024m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=@MSLOGDIR@ -XX:PermSize=256M" +JAVA_OPTS="-Djava.awt.headless=true -Djavax.net.ssl.trustStore=/etc/cloud/management/cloudmanagementserver.keystore -Djavax.net.ssl.trustStorePassword=vmops.com -Dcom.sun.management.jmxremote.port=45219 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Xmx2g -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=@MSLOGDIR@ -XX:MaxPermSize=512m -XX:PermSize=256M" # What user should run tomcat TOMCAT_USER="@MSUSER@"
