Author: agomes Date: Sun Oct 29 22:46:51 2017 New Revision: 1813712 URL: http://svn.apache.org/viewvc?rev=1813712&view=rev Log: Bug61693 : JMeter aware of Docker
Modified: jmeter/trunk/bin/jmeter jmeter/trunk/bin/jmeter.bat jmeter/trunk/xdocs/changes.xml Modified: jmeter/trunk/bin/jmeter URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/jmeter?rev=1813712&r1=1813711&r2=1813712&view=diff ============================================================================== --- jmeter/trunk/bin/jmeter (original) +++ jmeter/trunk/bin/jmeter Sun Oct 29 22:46:51 2017 @@ -131,6 +131,10 @@ HEAP="-Xms512m -Xmx512m -XX:MaxMetaspace # Uncomment this to generate GC verbose file with Java 9 and above # VERBOSE_GC="-Xlog:gc*,gc+age=trace,gc+heap=debug:file=gc_jmeter_%p.log" +# Uncomment this if you run JMeter in DOCKER (need Java SE 8u131 or JDK 9) +# see https://blogs.oracle.com/java-platform-group/java-se-support-for-docker-cpu-and-memory-limits +# RUN_IN_DOCKER="-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap" + # Finally, some tracing to help in case things go astray: GC_ALGO="-XX:+UseG1GC -XX:MaxGCPauseMillis=250 -XX:G1ReservePercent=20" @@ -140,6 +144,6 @@ DUMP="-XX:+HeapDumpOnOutOfMemoryError" SYSTEM_PROPS="-Djava.security.egd=file:/dev/urandom" SERVER="-server" -ARGS="$SERVER $DUMP $HEAP $VERBOSE_GC $GC_ALGO $SYSTEM_PROPS" +ARGS="$SERVER $DUMP $HEAP $VERBOSE_GC $GC_ALGO $SYSTEM_PROPS $RUN_IN_DOCKER" $JAVA_HOME/bin/java $ADD_MODS $ARGS $JVM_ARGS $JMETER_OPTS -jar "$PRGDIR/ApacheJMeter.jar" "$@" Modified: jmeter/trunk/bin/jmeter.bat URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/jmeter.bat?rev=1813712&r1=1813711&r2=1813712&view=diff ============================================================================== --- jmeter/trunk/bin/jmeter.bat (original) +++ jmeter/trunk/bin/jmeter.bat Sun Oct 29 22:46:51 2017 @@ -99,13 +99,17 @@ rem set VERBOSE_GC=-verbose:gc -Xloggc:g rem Uncomment this to generate GC verbose file with Java 9 and above rem set VERBOSE_GC=-Xlog:gc*,gc+age=trace,gc+heap=debug:file=gc_jmeter_%%p.log - set GC_ALGO=-XX:+UseG1GC -XX:MaxGCPauseMillis=250 -XX:G1ReservePercent=20 set SYSTEM_PROPS=-Djava.security.egd=file:/dev/urandom + rem Always dump on OOM (does not cost anything unless triggered) set DUMP=-XX:+HeapDumpOnOutOfMemoryError +rem Uncomment this if you run JMeter in DOCKER (need Java SE 8u131 or JDK 9) +rem see https://blogs.oracle.com/java-platform-group/java-se-support-for-docker-cpu-and-memory-limits +rem set RUN_IN_DOCKER=-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap + rem Additional settings that might help improve GUI performance on some platforms rem See: http://www.oracle.com/technetwork/java/perf-graphics-135933.html @@ -121,7 +125,7 @@ rem set DDRAW=%DDRAW% -Dsun.java2d.ddsca rem Server mode rem Collect the settings defined above -set ARGS=%DUMP% %HEAP% %VERBOSE_GC% %GC_ALGO% %DDRAW% %SYSTEM_PROPS% +set ARGS=%DUMP% %HEAP% %VERBOSE_GC% %GC_ALGO% %DDRAW% %SYSTEM_PROPS% %RUN_IN_DOCKER% %JM_START% %JM_LAUNCH% %ARGS% %JVM_ARGS% -jar "%JMETER_BIN%ApacheJMeter.jar" %JMETER_CMD_LINE_ARGS% Modified: jmeter/trunk/xdocs/changes.xml URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1813712&r1=1813711&r2=1813712&view=diff ============================================================================== --- jmeter/trunk/xdocs/changes.xml [utf-8] (original) +++ jmeter/trunk/xdocs/changes.xml [utf-8] Sun Oct 29 22:46:51 2017 @@ -140,6 +140,7 @@ Summary <li><bug>61656</bug><code>tearDown Thread Group</code> should run by default at stop or shutdown of test</li> <li><bug>61659</bug>JMeterVariables#get() should apply toString() on non string objects</li> <li><bug>61555</bug>Metaspace should be restricted as default</li> + <li><bug>61693</bug>JMeter aware of Docker (-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap)</li> </ul> <ch_section>Non-functional changes</ch_section>