From a34ba43f3bdf9539c3799a7d23341e879852ab72 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Wed, 7 Nov 2018 14:40:32 +0100 Subject: [PATCH] nope... Signed-off-by: Holger Levsen --- bin/start-slave.sh | 6 +++--- hosts/jenkins/etc/default/jenkins | 11 ++++++----- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/bin/start-slave.sh b/bin/start-slave.sh index 871de3d67..91367411e 100755 --- a/bin/start-slave.sh +++ b/bin/start-slave.sh @@ -17,7 +17,7 @@ if [ -f "$f" ]; then fi echo "This jenkins slave.jar will run as PID $$." -export JAVA_ARGS="-Xmn128M -Xms1G -Xmx1G -client" -export MALLOC_ARENA_MAX=1 -sleep 120m +#export JAVA_ARGS="-Xmn128M -Xms1G -Xmx1G -client" +export JAVA_ARGS="-Xmx2G" +#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 ac5ca966a..fd84ed7de 100644 --- a/hosts/jenkins/etc/default/jenkins +++ b/hosts/jenkins/etc/default/jenkins @@ -16,9 +16,10 @@ 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 -Xmn1G -Xms24G -Xmx24G" # heap settings -JAVA_ARGS="$JAVA_ARGS -server " -JAVA_ARGS="$JAVA_ARGS -XX:+AlwaysPreTouch" +JAVA_ARGS="$JAVA_ARGS -Xmx16G" # heap settings +#JAVA_ARGS="$JAVA_ARGS -Xmn1G -Xms24G -Xmx24G" # heap settings +#JAVA_ARGS="$JAVA_ARGS -server " +#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,11 +28,11 @@ JAVA_ARGS="$JAVA_ARGS -XX:+AlwaysPreTouch" #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 " +#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