From e4e4199b3fbf5383d60b5cc723009a0f75a23399 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Wed, 7 Nov 2018 12:23:28 +0100 Subject: [PATCH] use java settings more like yesterday Signed-off-by: Holger Levsen --- bin/start-slave.sh | 7 +++---- hosts/jenkins/etc/default/jenkins | 9 +++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/bin/start-slave.sh b/bin/start-slave.sh index c9707b88b..aaf3bc359 100755 --- a/bin/start-slave.sh +++ b/bin/start-slave.sh @@ -17,7 +17,6 @@ if [ -f "$f" ]; then fi echo "This jenkins slave.jar will run as PID $$." -#export JAVA_ARGS="-Xms768M -Xmx768M" -#export MALLOC_ARENA_MAX=1 -#exec java $JAVA_ARGS -jar /var/lib/jenkins/slave.jar -exec java -jar /var/lib/jenkins/slave.jar +export JAVA_ARGS="-Xms1G -Xmx1G" +export MALLOC_ARENA_MAX=1 +exec java $JAVA_ARGS -jar /var/lib/jenkins/slave.jar diff --git a/hosts/jenkins/etc/default/jenkins b/hosts/jenkins/etc/default/jenkins index a161d129d..4f70e1589 100644 --- a/hosts/jenkins/etc/default/jenkins +++ b/hosts/jenkins/etc/default/jenkins @@ -16,9 +16,9 @@ JAVA_ARGS="-Djava.awt.headless=true" #JAVA_ARGS="-Djava.net.preferIPv4Stack=true" # make jenkins listen on IPv4 address # See some recommendation from https://jenkins.io/blog/2016/11/21/gc-tuning/ -JAVA_ARGS="$JAVA_ARGS -Xms20G -Xmx40G" # heap settings +JAVA_ARGS="$JAVA_ARGS -Xms24G -Xmx24G" # heap settings JAVA_ARGS="$JAVA_ARGS -server " -#JAVA_ARGS="$JAVA_ARGS -XX:+AlwaysPreTouch" +JAVA_ARGS="$JAVA_ARGS -XX:+AlwaysPreTouch" # store heap dumps in case of OOM, to investigate it later #JAVA_ARGS="$JAVA_ARGS -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=$JENKINS_HOME/heapDumps/" # GC logging, in case somebody ever wants to actually finely tune the GC for us... @@ -27,10 +27,11 @@ JAVA_ARGS="$JAVA_ARGS -server " #JAVA_ARGS="$JAVA_ARGS -XX:+PrintGCDateStamps -XX:+PrintGCDetails -XX:+PrintHeapAtGC" #JAVA_ARGS="$JAVA_ARGS -XX:+PrintGCCause -XX:+PrintTenuringDistribution -XX:+PrintReferenceGC -XX:+PrintAdaptiveSizePolicy" # G1 GC settings -#JAVA_ARGS="$JAVA_ARGS -XX:+UseG1GC -XX:+ExplicitGCInvokesConcurrent -XX:+ParallelRefProcEnabled -XX:+UseStringDeduplication" +JAVA_ARGS="$JAVA_ARGS -XX:+UseG1GC " +#JAVA_ARGS="$JAVA_ARGS -XX:+ExplicitGCInvokesConcurrent -XX:+ParallelRefProcEnabled -XX:+UseStringDeduplication" #JAVA_ARGS="$JAVA_ARGS -XX:+UnlockExperimentalVMOptions -XX:G1NewSizePercent=10 -XX:+UnlockDiagnosticVMOptions -XX:G1SummarizeRSetStatsPeriod=1" # h01ger trying stuff -#export MALLOC_ARENA_MAX=1 +export MALLOC_ARENA_MAX=1 # make jenkins listen on IPv4 address #JAVA_ARGS="-Djava.net.preferIPv4Stack=true" -- GitLab