You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2011/12/05 22:35:40 UTC
svn commit: r1210651 - in
/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main:
distribution/unix-shell/bin/ distribution/windows-text/bin/
filtered-resources/bin/
Author: jbonofre
Date: Mon Dec 5 21:35:40 2011
New Revision: 1210651
URL: http://svn.apache.org/viewvc?rev=1210651&view=rev
Log:
[KARAF-1019] Set java perm memory options only when required
Modified:
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/karaf
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/windows-text/bin/karaf.bat
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/bin/admin
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/bin/admin.bat
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/bin/client
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/bin/client.bat
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/bin/shell
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/bin/shell.bat
Modified: karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/karaf
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/karaf?rev=1210651&r1=1210650&r2=1210651&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/karaf (original)
+++ karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/karaf Mon Dec 5 21:35:40 2011
@@ -38,14 +38,6 @@ if [ "x$JAVA_MAX_MEM" = "x" ]; then
JAVA_MAX_MEM=512M
export JAVA_MAX_MEM
fi
-if [ "x$JAVA_PERM_MEM" = "x" ]; then
- JAVA_PERM_MEM=16M
- export JAVA_PERM_MEM
-fi
-if [ "x$JAVA_MAX_PERM_MEM" = "x" ]; then
- JAVA_MAX_PERM_MEM=64M
- export JAVA_MAX_PERM_MEM
-fi
warn() {
echo "${PROGNAME}: $*"
@@ -249,7 +241,16 @@ setupDefaults() {
#Set the JVM_VENDOR specific JVM flags
if [ "$JVM_VENDOR" = "SUN" ]; then
- DEFAULT_JAVA_OPTS="-server $DEFAULT_JAVA_OPTS -XX:PermSize=$JAVA_PERM_MEM -XX:MaxPermSize=$JAVA_MAX_PERM_MEM -Dcom.sun.management.jmxremote"
+ #
+ # Check some easily accessible MIN/MAX params for JVM mem usage
+ #
+ if [ "x$JAVA_PERM_MEM" != "x" ]; then
+ DEFAULT_JAVA_OPTS="$DEFAULT_JAVA_OPTS -XX:PermSize=$JAVA_PERM_MEM"
+ fi
+ if [ "x$JAVA_MAX_PERM_MEM" != "x" ]; then
+ DEFAULT_JAVA_OPTS="$DEFAULT_JAVA_OPTS -XX:MaxPermSize=$JAVA_MAX_PERM_MEM"
+ fi
+ DEFAULT_JAVA_OPTS="-server $DEFAULT_JAVA_OPTS -Dcom.sun.management.jmxremote"
elif [ "$JVM_VENDOR" = "IBM" ]; then
if $os400; then
DEFAULT_JAVA_OPTS="$DEFAULT_JAVA_OPTS"
Modified: karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/windows-text/bin/karaf.bat
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/windows-text/bin/karaf.bat?rev=1210651&r1=1210650&r2=1210651&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/windows-text/bin/karaf.bat (original)
+++ karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/windows-text/bin/karaf.bat Mon Dec 5 21:35:40 2011
@@ -44,12 +44,6 @@ if "%JAVA_MIN_MEM%" == "" (
if "%JAVA_MAX_MEM%" == "" (
set JAVA_MAX_MEM=512M
)
-if "%JAVA_PERM_MEM%" == "" (
- set JAVA_PERM_MEM=16M
-)
-if "%JAVA_MAX_PERM_MEM%" == "" (
- set JAVA_MAX_PERM_MEM=64M
-)
goto BEGIN
@@ -92,6 +86,15 @@ if "%KARAF_DATA%" == "" (
set LOCAL_CLASSPATH=%CLASSPATH%
set DEFAULT_JAVA_OPTS=-server -Xms%JAVA_MIN_MEM% -Xmx%JAVA_MAX_MEM% -XX:PermSize=%JAVA_PERM_MEM% -XX:MaxPermSize=%JAVA_MAX_PERM_MEM% -Dderby.system.home="%KARAF_DATA%\derby" -Dderby.storage.fileSyncTransactionLog=true -Dcom.sun.management.jmxremote
+
+rem Check some easily accessible MIN/MAX params for JVM mem usage
+if not "%JAVA_PERM_MEM%" == "" (
+ set DEFAULT_JAVA_OPTS=%DEFAULT_JAVA_OPTS% -XX:PermSize=%JAVA_PERM_MEM%
+)
+if not "%JAVA_MAX_PERM_MEM%" == "" (
+ set DEFAULT_JAVA_OPTS=%DEFAULT_JAVA_OPTS% -XX:MaxPermSize=%JAVA_MAX_PERM_MEM%
+)
+
set CLASSPATH=%LOCAL_CLASSPATH%;%KARAF_BASE%\conf
set DEFAULT_JAVA_DEBUG_OPTS=-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005
Modified: karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/bin/admin
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/bin/admin?rev=1210651&r1=1210650&r2=1210651&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/bin/admin (original)
+++ karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/bin/admin Mon Dec 5 21:35:40 2011
@@ -38,14 +38,6 @@ if [ "x$JAVA_MAX_MEM" = "x" ]; then
JAVA_MAX_MEM=512M
export JAVA_MAX_MEM
fi
-if [ "x$JAVA_PERM_MEM" = "x" ]; then
- JAVA_PERM_MEM=16M
- export JAVA_PERM_MEM
-fi
-if [ "x$JAVA_MAX_PERM_MEM" = "x" ]; then
- JAVA_MAX_PERM_MEM=64M
- export JAVA_MAX_PERM_MEM
-fi
warn() {
echo "${PROGNAME}: $*"
@@ -249,6 +241,15 @@ setupDefaults() {
#Set the JVM_VENDOR specific JVM flags
if [ "$JVM_VENDOR" = "SUN" ]; then
+ #
+ # Check some easily accessible MIN/MAX params for JVM mem usage
+ #
+ if [ "x$JAVA_PERM_MEM" != "x" ]; then
+ DEFAULT_JAVA_OPTS="$DEFAULT_JAVA_OPTS -XX:PermSize=$JAVA_PERM_MEM"
+ fi
+ if [ "x$JAVA_MAX_PERM_MEM" != "x" ]; then
+ DEFAULT_JAVA_OPTS="$DEFAULT_JAVA_OPTS -XX:MaxPermSize=$JAVA_MAX_PERM_MEM"
+ fi
DEFAULT_JAVA_OPTS="-server $DEFAULT_JAVA_OPTS -Dcom.sun.management.jmxremote"
elif [ "$JVM_VENDOR" = "IBM" ]; then
if $os400; then
Modified: karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/bin/admin.bat
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/bin/admin.bat?rev=1210651&r1=1210650&r2=1210651&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/bin/admin.bat (original)
+++ karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/bin/admin.bat Mon Dec 5 21:35:40 2011
@@ -44,12 +44,6 @@ if "%JAVA_MIN_MEM%" == "" (
if "%JAVA_MAX_MEM%" == "" (
set JAVA_MAX_MEM=512M
)
-if "%JAVA_PERM_MEM%" == "" (
- set JAVA_PERM_MEM=16M
-)
-if "%JAVA_MAX_PERM_MEM%" == "" (
- set JAVA_MAX_PERM_MEM=64M
-)
goto BEGIN
Modified: karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/bin/client
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/bin/client?rev=1210651&r1=1210650&r2=1210651&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/bin/client (original)
+++ karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/bin/client Mon Dec 5 21:35:40 2011
@@ -38,14 +38,6 @@ if [ "x$JAVA_MAX_MEM" = "x" ]; then
JAVA_MAX_MEM=512M
export JAVA_MAX_MEM
fi
-if [ "x$JAVA_PERM_MEM" = "x" ]; then
- JAVA_PERM_MEM=16M
- export JAVA_PERM_MEM
-fi
-if [ "x$JAVA_MAX_PERM_MEM" = "x" ]; then
- JAVA_MAX_PERM_MEM=64M
- export JAVA_MAX_PERM_MEM
-fi
warn() {
echo "${PROGNAME}: $*"
@@ -249,6 +241,15 @@ setupDefaults() {
#Set the JVM_VENDOR specific JVM flags
if [ "$JVM_VENDOR" = "SUN" ]; then
+ #
+ # Check some easily accessible MIN/MAX params for JVM mem usage
+ #
+ if [ "x$JAVA_PERM_MEM" != "x" ]; then
+ DEFAULT_JAVA_OPTS="$DEFAULT_JAVA_OPTS -XX:PermSize=$JAVA_PERM_MEM"
+ fi
+ if [ "x$JAVA_MAX_PERM_MEM" != "x" ]; then
+ DEFAULT_JAVA_OPTS="$DEFAULT_JAVA_OPTS -XX:MaxPermSize=$JAVA_MAX_PERM_MEM"
+ fi
DEFAULT_JAVA_OPTS="-server $DEFAULT_JAVA_OPTS -Dcom.sun.management.jmxremote"
elif [ "$JVM_VENDOR" = "IBM" ]; then
if $os400; then
Modified: karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/bin/client.bat
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/bin/client.bat?rev=1210651&r1=1210650&r2=1210651&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/bin/client.bat (original)
+++ karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/bin/client.bat Mon Dec 5 21:35:40 2011
@@ -44,12 +44,6 @@ if "%JAVA_MIN_MEM%" == "" (
if "%JAVA_MAX_MEM%" == "" (
set JAVA_MAX_MEM=512M
)
-if "%JAVA_PERM_MEM%" == "" (
- set JAVA_PERM_MEM=16M
-)
-if "%JAVA_MAX_PERM_MEM%" == "" (
- set JAVA_MAX_PERM_MEM=64M
-)
goto BEGIN
Modified: karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/bin/shell
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/bin/shell?rev=1210651&r1=1210650&r2=1210651&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/bin/shell (original)
+++ karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/bin/shell Mon Dec 5 21:35:40 2011
@@ -38,14 +38,6 @@ if [ "x$JAVA_MAX_MEM" = "x" ]; then
JAVA_MAX_MEM=512M
export JAVA_MAX_MEM
fi
-if [ "x$JAVA_PERM_MEM" = "x" ]; then
- JAVA_PERM_MEM=16M
- export JAVA_PERM_MEM
-fi
-if [ "x$JAVA_MAX_PERM_MEM" = "x" ]; then
- JAVA_MAX_PERM_MEM=64M
- export JAVA_MAX_PERM_MEM
-fi
warn() {
echo "${PROGNAME}: $*"
@@ -249,6 +241,15 @@ setupDefaults() {
#Set the JVM_VENDOR specific JVM flags
if [ "$JVM_VENDOR" = "SUN" ]; then
+ #
+ # Check some easily accessible MIN/MAX params for JVM mem usage
+ #
+ if [ "x$JAVA_PERM_MEM" != "x" ]; then
+ DEFAULT_JAVA_OPTS="$DEFAULT_JAVA_OPTS -XX:PermSize=$JAVA_PERM_MEM"
+ fi
+ if [ "x$JAVA_MAX_PERM_MEM" != "x" ]; then
+ DEFAULT_JAVA_OPTS="$DEFAULT_JAVA_OPTS -XX:MaxPermSize=$JAVA_MAX_PERM_MEM"
+ fi
DEFAULT_JAVA_OPTS="-server $DEFAULT_JAVA_OPTS -Dcom.sun.management.jmxremote"
elif [ "$JVM_VENDOR" = "IBM" ]; then
if $os400; then
Modified: karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/bin/shell.bat
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/bin/shell.bat?rev=1210651&r1=1210650&r2=1210651&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/bin/shell.bat (original)
+++ karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/bin/shell.bat Mon Dec 5 21:35:40 2011
@@ -44,12 +44,6 @@ if "%JAVA_MIN_MEM%" == "" (
if "%JAVA_MAX_MEM%" == "" (
set JAVA_MAX_MEM=512M
)
-if "%JAVA_PERM_MEM%" == "" (
- set JAVA_PERM_MEM=16M
-)
-if "%JAVA_MAX_PERM_MEM%" == "" (
- set JAVA_MAX_PERM_MEM=64M
-)
goto BEGIN