Skip to content

Commit ef1638c

Browse files
author
Kapil Rastogi
authored
Merge pull request #172 from ExpediaDotCom/g1gc
allow to override gc opts with default as G1GC
2 parents 288e233 + 1beae97 commit ef1638c

2 files changed

Lines changed: 5 additions & 4 deletions

File tree

‎indexer/build/docker/start-app.sh‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@
22

33
[ -z "$JAVA_XMS" ] && JAVA_XMS=1024m
44
[ -z "$JAVA_XMX" ] && JAVA_XMX=1024m
5+
[ -z "$JAVA_GC_OPTS" ] && JAVA_GC_OPTS="-XX:+UseG1GC"
56

67
set -e
78
JAVA_OPTS="${JAVA_OPTS} \
89
-javaagent:${APP_HOME}/${JMXTRANS_AGENT}.jar=${APP_HOME}/jmxtrans-agent.xml \
9-
-XX:+UseConcMarkSweepGC \
10-
-XX:+UseParNewGC \
10+
${JAVA_GC_OPTS} \
1111
-Xmx${JAVA_XMX} \
1212
-Xms${JAVA_XMS} \
13+
-XX:+ExitOnOutOfMemoryError \
1314
-Dapplication.name=${APP_NAME} \
1415
-Dapplication.home=${APP_HOME}"
1516

‎reader/build/docker/start-app.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
[ -z "$JAVA_XMS" ] && JAVA_XMS=1024m
44
[ -z "$JAVA_XMX" ] && JAVA_XMX=1024m
5+
[ -z "$JAVA_GC_OPTS" ] && JAVA_GC_OPTS="-XX:+UseG1GC"
56

67
set -e
78
JAVA_OPTS="${JAVA_OPTS} \
89
-javaagent:${APP_HOME}/${JMXTRANS_AGENT}.jar=${APP_HOME}/jmxtrans-agent.xml \
9-
-XX:+UseConcMarkSweepGC \
10-
-XX:+UseParNewGC \
10+
${JAVA_GC_OPTS} \
1111
-Xmx${JAVA_XMX} \
1212
-Xms${JAVA_XMS} \
1313
-XX:+ExitOnOutOfMemoryError \

0 commit comments

Comments
 (0)