diff --git a/docker-images/quick-start/wrapper.conf b/docker-images/quick-start/wrapper.conf index 7ca257ffe..a54439746 100644 --- a/docker-images/quick-start/wrapper.conf +++ b/docker-images/quick-start/wrapper.conf @@ -28,17 +28,16 @@ wrapper.java.library.path.1=lib wrapper.java.additional.1=-DDBLE_HOME=. wrapper.java.additional.2=-agentlib:jdwp=transport=dt_socket,server=y,address=8088,suspend=n wrapper.java.additional.3=-server -wrapper.java.additional.4=-XX:MaxPermSize=64M -wrapper.java.additional.5=-XX:+AggressiveOpts -wrapper.java.additional.6=-Dfile.encoding=UTF-8 -wrapper.java.additional.7=-Dcom.sun.management.jmxremote -wrapper.java.additional.8=-Dcom.sun.management.jmxremote.port=1984 -wrapper.java.additional.9=-Dcom.sun.management.jmxremote.authenticate=false -wrapper.java.additional.10=-Dcom.sun.management.jmxremote.ssl=false -wrapper.java.additional.11=-Dcom.sun.management.jmxremote.host=127.0.0.1 -wrapper.java.additional.12=-Xmx4G -wrapper.java.additional.13=-Xms1G -wrapper.java.additional.14=-XX:MaxDirectMemorySize=1G +wrapper.java.additional.4=-XX:+AggressiveOpts +wrapper.java.additional.5=-Dfile.encoding=UTF-8 +wrapper.java.additional.6=-Dcom.sun.management.jmxremote +wrapper.java.additional.7=-Dcom.sun.management.jmxremote.port=1984 +wrapper.java.additional.8=-Dcom.sun.management.jmxremote.authenticate=false +wrapper.java.additional.9=-Dcom.sun.management.jmxremote.ssl=false +wrapper.java.additional.10=-Dcom.sun.management.jmxremote.host=127.0.0.1 +wrapper.java.additional.11=-Xmx4G +wrapper.java.additional.12=-Xms1G +wrapper.java.additional.13=-XX:MaxDirectMemorySize=1G # Initial Java Heap Size (in MB) #wrapper.java.initmemory=3 diff --git a/pom.xml b/pom.xml index 347e42f51..5c3a5cc56 100644 --- a/pom.xml +++ b/pom.xml @@ -539,7 +539,6 @@ -server - -XX:MaxPermSize=64M -XX:+AggressiveOpts -Dfile.encoding=UTF-8 diff --git a/src/main/assembly/bin/init_ucore_data.sh b/src/main/assembly/bin/init_ucore_data.sh index f731998df..792f8f6a8 100644 --- a/src/main/assembly/bin/init_ucore_data.sh +++ b/src/main/assembly/bin/init_ucore_data.sh @@ -21,5 +21,5 @@ if [ ! -n "$1" ]; then DBLE_HOME=`pwd` fi cd $CURR_DIR -$JAVA_CMD -Xms256M -Xmx1G -XX:MaxPermSize=64M -DDBLE_HOME=$DBLE_HOME -cp "$DBLE_HOME/conf:$DBLE_HOME/lib/*" $MAIN_CLASS +$JAVA_CMD -Xms256M -Xmx1G -DDBLE_HOME=$DBLE_HOME -cp "$DBLE_HOME/conf:$DBLE_HOME/lib/*" $MAIN_CLASS echo "---------finished------------" diff --git a/src/main/assembly/bin/init_zk_data.sh b/src/main/assembly/bin/init_zk_data.sh index b7797f704..fb98be954 100644 --- a/src/main/assembly/bin/init_zk_data.sh +++ b/src/main/assembly/bin/init_zk_data.sh @@ -15,5 +15,5 @@ CURR_DIR=`pwd` cd .. DBLE_HOME=`pwd` cd $CURR_DIR -$JAVA_CMD -Xms256M -Xmx1G -XX:MaxPermSize=64M -DDBLE_HOME=$DBLE_HOME -cp "$DBLE_HOME/conf:$DBLE_HOME/lib/*" $MAIN_CLASS +$JAVA_CMD -Xms256M -Xmx1G -DDBLE_HOME=$DBLE_HOME -cp "$DBLE_HOME/conf:$DBLE_HOME/lib/*" $MAIN_CLASS echo "---------finished------------" diff --git a/src/main/assembly/bin/startup_nowrap.sh b/src/main/assembly/bin/startup_nowrap.sh index 46ea0bcd0..29e8662be 100644 --- a/src/main/assembly/bin/startup_nowrap.sh +++ b/src/main/assembly/bin/startup_nowrap.sh @@ -16,8 +16,8 @@ if $noJavaHome ; then fi #============================================================================== #set JAVA_OPTS -JAVA_OPTS="-server -Xms2G -Xmx2G -XX:MaxPermSize=64M -XX:+AggressiveOpts -XX:MaxDirectMemorySize=2G" -#JAVA_OPTS="-server -Xms4G -Xmx4G -XX:MaxPermSize=64M -XX:+AggressiveOpts -XX:MaxDirectMemorySize=6G" +JAVA_OPTS="-server -Xms2G -Xmx2G -XX:+AggressiveOpts -XX:MaxDirectMemorySize=2G" +#JAVA_OPTS="-server -Xms4G -Xmx4G -XX:+AggressiveOpts -XX:MaxDirectMemorySize=6G" #performance Options #JAVA_OPTS="$JAVA_OPTS -Xss256k" #JAVA_OPTS="$JAVA_OPTS -XX:+AggressiveOpts" diff --git a/src/main/resources/wrapper.conf b/src/main/resources/wrapper.conf index 77515662f..2c1d04c24 100644 --- a/src/main/resources/wrapper.conf +++ b/src/main/resources/wrapper.conf @@ -28,17 +28,16 @@ wrapper.java.library.path.1=lib wrapper.java.additional.1=-DDBLE_HOME=. wrapper.java.additional.2=-agentlib:jdwp=transport=dt_socket,server=y,address=8088,suspend=n wrapper.java.additional.3=-server -wrapper.java.additional.4=-XX:MaxPermSize=64M -wrapper.java.additional.5=-XX:+AggressiveOpts -wrapper.java.additional.6=-Dfile.encoding=UTF-8 -wrapper.java.additional.7=-Dcom.sun.management.jmxremote -wrapper.java.additional.8=-Dcom.sun.management.jmxremote.port=1984 -wrapper.java.additional.9=-Dcom.sun.management.jmxremote.authenticate=false -wrapper.java.additional.10=-Dcom.sun.management.jmxremote.ssl=false -wrapper.java.additional.11=-Dcom.sun.management.jmxremote.host=127.0.0.1 -wrapper.java.additional.12=-Xmx4G -wrapper.java.additional.13=-Xms1G -wrapper.java.additional.14=-XX:MaxDirectMemorySize=2G +wrapper.java.additional.4=-XX:+AggressiveOpts +wrapper.java.additional.5=-Dfile.encoding=UTF-8 +wrapper.java.additional.6=-Dcom.sun.management.jmxremote +wrapper.java.additional.7=-Dcom.sun.management.jmxremote.port=1984 +wrapper.java.additional.8=-Dcom.sun.management.jmxremote.authenticate=false +wrapper.java.additional.9=-Dcom.sun.management.jmxremote.ssl=false +wrapper.java.additional.10=-Dcom.sun.management.jmxremote.host=127.0.0.1 +wrapper.java.additional.11=-Xmx4G +wrapper.java.additional.12=-Xms1G +wrapper.java.additional.13=-XX:MaxDirectMemorySize=2G # Initial Java Heap Size (in MB) #wrapper.java.initmemory=3 diff --git a/src/test/java/com/actiontech/dble/cache/TestCachePoolPerformance.java b/src/test/java/com/actiontech/dble/cache/TestCachePoolPerformance.java index 9ac7e101d..709cfb51b 100644 --- a/src/test/java/com/actiontech/dble/cache/TestCachePoolPerformance.java +++ b/src/test/java/com/actiontech/dble/cache/TestCachePoolPerformance.java @@ -14,7 +14,7 @@ import net.sf.ehcache.config.MemoryUnit; /** * test cache performance ,for encache test set VM param -server -Xms1100M -Xmx1100M - * for mapdb set vm param -server -Xms100M -Xmx100M -XX:MaxPermSize=1G + * for mapdb set vm param -server -Xms100M -Xmx100M */ public class TestCachePoolPerformance {