IGNITE-255: Jvm8 warns that MaxPermSize is ignored
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/452673d3 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/452673d3 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/452673d3 Branch: refs/heads/ignite-1232 Commit: 452673d3e2d3c8d0fe1e72d177437841f412df9a Parents: 3472a84 Author: Saikat Maitra <[email protected]> Authored: Wed Mar 2 01:55:20 2016 +0300 Committer: Denis Magda <[email protected]> Committed: Wed Mar 2 01:55:20 2016 +0300 ---------------------------------------------------------------------- bin/ignite.bat | 7 ++++++- bin/ignite.sh | 6 +++++- 2 files changed, 11 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/452673d3/bin/ignite.bat ---------------------------------------------------------------------- diff --git a/bin/ignite.bat b/bin/ignite.bat index 788a85f..b999b86 100644 --- a/bin/ignite.bat +++ b/bin/ignite.bat @@ -159,7 +159,12 @@ if "%JMX_PORT%" == "" ( :: :: ADD YOUR/CHANGE ADDITIONAL OPTIONS HERE :: -if "%JVM_OPTS%" == "" set JVM_OPTS=-Xms1g -Xmx1g -server -XX:+AggressiveOpts -XX:MaxPermSize=256m +"%JAVA_HOME%\bin\java.exe" -version 2>&1 | findstr "1\.[7]\." > nul +if %ERRORLEVEL% equ 0 ( + if "%JVM_OPTS%" == "" set JVM_OPTS=-Xms1g -Xmx1g -server -XX:+AggressiveOpts -XX:MaxPermSize=256m +) else ( + if "%JVM_OPTS%" == "" set JVM_OPTS=-Xms1g -Xmx1g -server -XX:+AggressiveOpts -XX:MaxMetaspaceSize=256m +) :: :: Uncomment the following GC settings if you see spikes in your throughput due to Garbage Collection. http://git-wip-us.apache.org/repos/asf/ignite/blob/452673d3/bin/ignite.sh ---------------------------------------------------------------------- diff --git a/bin/ignite.sh b/bin/ignite.sh index 7fbca57..05d2d5f 100755 --- a/bin/ignite.sh +++ b/bin/ignite.sh @@ -90,7 +90,11 @@ fi # ADD YOUR/CHANGE ADDITIONAL OPTIONS HERE # if [ -z "$JVM_OPTS" ] ; then - JVM_OPTS="-Xms1g -Xmx1g -server -XX:+AggressiveOpts -XX:MaxPermSize=256m" + if [[ `"$JAVA" -version 2>&1 | egrep "1\.[7]\."` ]]; then + JVM_OPTS="-Xms1g -Xmx1g -server -XX:+AggressiveOpts -XX:MaxPermSize=256m" + else + JVM_OPTS="-Xms1g -Xmx1g -server -XX:+AggressiveOpts -XX:MaxMetaspaceSize=256m" + fi fi #
