This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch karaf-4.2.x
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/karaf-4.2.x by this push:
new acbe2c0 [KARAF-5628] Corrupt gc.log due to unseparated VM settings
acbe2c0 is described below
commit acbe2c0a990f03fb362a619fec17074ca5ba1be4
Author: Aleksandar Vasilev <[email protected]>
AuthorDate: Tue Oct 8 17:38:53 2019 +0300
[KARAF-5628] Corrupt gc.log due to unseparated VM settings
setenv would recognize original calling script. So EXTRA_JAVA_OPTS or
JAVA_OPTS could be set from there script based with bat/sh if statement.
(cherry picked from commit e66f121f2b9d619dcd9a78df52525aeb0bd6a0c9)
---
.../main/filtered-resources/resources/bin/client | 6 +++--
.../filtered-resources/resources/bin/client.bat | 4 ++-
.../src/main/filtered-resources/resources/bin/inc | 31 +++++++++++++---------
.../main/filtered-resources/resources/bin/instance | 6 +++--
.../filtered-resources/resources/bin/instance.bat | 4 ++-
.../main/filtered-resources/resources/bin/karaf | 6 +++--
.../filtered-resources/resources/bin/karaf.bat | 5 +++-
.../main/filtered-resources/resources/bin/shell | 6 +++--
.../filtered-resources/resources/bin/shell.bat | 4 ++-
.../main/filtered-resources/resources/bin/start | 6 +++--
.../filtered-resources/resources/bin/start.bat | 4 ++-
.../main/filtered-resources/resources/bin/status | 7 ++---
.../filtered-resources/resources/bin/status.bat | 4 ++-
.../src/main/filtered-resources/resources/bin/stop | 6 +++--
.../main/filtered-resources/resources/bin/stop.bat | 4 ++-
15 files changed, 68 insertions(+), 35 deletions(-)
diff --git
a/assemblies/features/base/src/main/filtered-resources/resources/bin/client
b/assemblies/features/base/src/main/filtered-resources/resources/bin/client
index 0671723..482c030 100755
--- a/assemblies/features/base/src/main/filtered-resources/resources/bin/client
+++ b/assemblies/features/base/src/main/filtered-resources/resources/bin/client
@@ -68,8 +68,10 @@ PROGNAME=`basename "${REALNAME}"`
#
# Sourcing environment settings for karaf similar to tomcats setenv
#
-KARAF_SCRIPT="${PROGNAME}"
-export KARAF_SCRIPT
+if [ "x${KARAF_SCRIPT}" = "x" ]; then
+ KARAF_SCRIPT="${PROGNAME}"
+ export KARAF_SCRIPT
+fi
if [ -f "${DIRNAME}/setenv" ]; then
. "${DIRNAME}/setenv"
fi
diff --git
a/assemblies/features/base/src/main/filtered-resources/resources/bin/client.bat
b/assemblies/features/base/src/main/filtered-resources/resources/bin/client.bat
index a451db6..11273d4 100644
---
a/assemblies/features/base/src/main/filtered-resources/resources/bin/client.bat
+++
b/assemblies/features/base/src/main/filtered-resources/resources/bin/client.bat
@@ -26,7 +26,9 @@ set TERM=windows
set ARGS=%*
rem Sourcing environment settings for karaf similar to tomcats setenv
-SET KARAF_SCRIPT="client.bat"
+if "%KARAF_SCRIPT%" == "" (
+ SET KARAF_SCRIPT="client.bat"
+)
if exist "%DIRNAME%setenv.bat" (
call "%DIRNAME%setenv.bat"
)
diff --git
a/assemblies/features/base/src/main/filtered-resources/resources/bin/inc
b/assemblies/features/base/src/main/filtered-resources/resources/bin/inc
index 4d9f67c..f32a990 100755
--- a/assemblies/features/base/src/main/filtered-resources/resources/bin/inc
+++ b/assemblies/features/base/src/main/filtered-resources/resources/bin/inc
@@ -271,6 +271,21 @@ setupDebugOptions() {
fi
}
+setupVendorSepcifics() {
+ #Set the JVM_VENDOR specific JVM flags
+ if [ "${JVM_VENDOR}" = "SUN" ]; then
+ JAVA_VENDOR_OPTS="-Dcom.sun.management.jmxremote"
+ elif [ "${JVM_VENDOR}" = "IBM" ]; then
+ if ${os400}; then
+ JAVA_VENDOR_OPTS=
+ elif ${aix}; then
+ JAVA_VENDOR_OPTS="-Xverify:none -Xdump:heap -Xlp "
+ else
+ JAVA_VENDOR_OPTS="-Xverify:none"
+ fi
+ fi
+}
+
setupDefaults() {
#
# Set up some easily accessible MIN/MAX params for JVM mem usage
@@ -286,18 +301,9 @@ setupDefaults() {
DEFAULT_JAVA_OPTS="-Xms${JAVA_MIN_MEM} -Xmx${JAVA_MAX_MEM}
-XX:+UnlockDiagnosticVMOptions "
- #Set the JVM_VENDOR specific JVM flags
- if [ "${JVM_VENDOR}" = "SUN" ]; then
- DEFAULT_JAVA_OPTS="${DEFAULT_JAVA_OPTS} -Dcom.sun.management.jmxremote"
- elif [ "${JVM_VENDOR}" = "IBM" ]; then
- if ${os400}; then
- DEFAULT_JAVA_OPTS="${DEFAULT_JAVA_OPTS}"
- elif ${aix}; then
- DEFAULT_JAVA_OPTS="-Xverify:none -Xdump:heap -Xlp
${DEFAULT_JAVA_OPTS}"
- else
- DEFAULT_JAVA_OPTS="-Xverify:none ${DEFAULT_JAVA_OPTS}"
- fi
- fi
+ setupVendorSepcifics
+
+ DEFAULT_JAVA_OPTS="${DEFAULT_JAVA_OPTS} ${JAVA_VENDOR_OPTS}"
DEFAULT_JAVA_DEBUG_PORT="5005"
if [ "x${JAVA_DEBUG_PORT}" = "x" ]; then
@@ -332,4 +338,3 @@ convertPaths() {
fi
fi
}
-
diff --git
a/assemblies/features/base/src/main/filtered-resources/resources/bin/instance
b/assemblies/features/base/src/main/filtered-resources/resources/bin/instance
index 12c0596..afbe156 100755
---
a/assemblies/features/base/src/main/filtered-resources/resources/bin/instance
+++
b/assemblies/features/base/src/main/filtered-resources/resources/bin/instance
@@ -68,8 +68,10 @@ PROGNAME=`basename "${REALNAME}"`
#
# Sourcing environment settings for karaf similar to tomcats setenv
#
-KARAF_SCRIPT="${PROGNAME}"
-export KARAF_SCRIPT
+if [ "x${KARAF_SCRIPT}" = "x" ]; then
+ KARAF_SCRIPT="${PROGNAME}"
+ export KARAF_SCRIPT
+fi
if [ -f "${DIRNAME}/setenv" ]; then
. "${DIRNAME}/setenv"
fi
diff --git
a/assemblies/features/base/src/main/filtered-resources/resources/bin/instance.bat
b/assemblies/features/base/src/main/filtered-resources/resources/bin/instance.bat
index dcf8526..0ff82cc 100644
---
a/assemblies/features/base/src/main/filtered-resources/resources/bin/instance.bat
+++
b/assemblies/features/base/src/main/filtered-resources/resources/bin/instance.bat
@@ -25,7 +25,9 @@ set PROGNAME=%~nx0%
set ARGS=%*
rem Sourcing environment settings for karaf similar to tomcats setenv
-SET KARAF_SCRIPT="instance.bat"
+if "%KARAF_SCRIPT%" == "" (
+ SET KARAF_SCRIPT="instance.bat"
+)
if exist "%DIRNAME%setenv.bat" (
call "%DIRNAME%setenv.bat"
)
diff --git
a/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf
b/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf
index 5aa925c..e51bb8d 100755
--- a/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf
+++ b/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf
@@ -69,8 +69,10 @@ LOCAL_CLASSPATH=$CLASSPATH
#
# Sourcing environment settings for karaf similar to tomcats setenv
#
-KARAF_SCRIPT="${PROGNAME}"
-export KARAF_SCRIPT
+if [ "x${KARAF_SCRIPT}" = "x" ]; then
+ KARAF_SCRIPT="${PROGNAME}"
+ export KARAF_SCRIPT
+fi
if [ -f "${DIRNAME}/setenv" ]; then
. "${DIRNAME}/setenv"
fi
diff --git
a/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf.bat
b/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf.bat
index 96c24fe..028c54b 100644
---
a/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf.bat
+++
b/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf.bat
@@ -25,7 +25,10 @@ set PROGNAME=%~nx0%
set ARGS=%*
rem Sourcing environment settings for karaf similar to tomcats setenv
-SET KARAF_SCRIPT="karaf.bat"
+
+if "%KARAF_SCRIPT%" == "" (
+ SET KARAF_SCRIPT="karaf.bat"
+)
if exist "%DIRNAME%setenv.bat" (
call "%DIRNAME%setenv.bat"
)
diff --git
a/assemblies/features/base/src/main/filtered-resources/resources/bin/shell
b/assemblies/features/base/src/main/filtered-resources/resources/bin/shell
index cd33991..96ea4fd 100755
--- a/assemblies/features/base/src/main/filtered-resources/resources/bin/shell
+++ b/assemblies/features/base/src/main/filtered-resources/resources/bin/shell
@@ -68,8 +68,10 @@ PROGNAME=`basename "${REALNAME}"`
#
# Sourcing environment settings for karaf similar to tomcats setenv
#
-KARAF_SCRIPT="${PROGNAME}"
-export KARAF_SCRIPT
+if [ "x${KARAF_SCRIPT}" = "x" ]; then
+ KARAF_SCRIPT="${PROGNAME}"
+ export KARAF_SCRIPT
+fi
if [ -f "${DIRNAME}/setenv" ]; then
. "${DIRNAME}/setenv"
fi
diff --git
a/assemblies/features/base/src/main/filtered-resources/resources/bin/shell.bat
b/assemblies/features/base/src/main/filtered-resources/resources/bin/shell.bat
index 0489ddc..875ba15 100644
---
a/assemblies/features/base/src/main/filtered-resources/resources/bin/shell.bat
+++
b/assemblies/features/base/src/main/filtered-resources/resources/bin/shell.bat
@@ -25,7 +25,9 @@ set PROGNAME=%~nx0%
set ARGS=%*
rem Sourcing environment settings for karaf similar to tomcats setenv
-SET KARAF_SCRIPT="shell.bat"
+if "%KARAF_SCRIPT%" == "" (
+ SET KARAF_SCRIPT="shell.bat"
+)
if exist "%DIRNAME%setenv.bat" (
call "%DIRNAME%setenv.bat"
)
diff --git
a/assemblies/features/base/src/main/filtered-resources/resources/bin/start
b/assemblies/features/base/src/main/filtered-resources/resources/bin/start
index 0777190..53c67b7 100755
--- a/assemblies/features/base/src/main/filtered-resources/resources/bin/start
+++ b/assemblies/features/base/src/main/filtered-resources/resources/bin/start
@@ -68,8 +68,10 @@ PROGNAME=`basename "${REALNAME}"`
#
# Sourcing environment settings for karaf similar to tomcats setenv
#
-KARAF_SCRIPT="${PROGNAME}"
-export KARAF_SCRIPT
+if [ "x${KARAF_SCRIPT}" = "x" ]; then
+ KARAF_SCRIPT="${PROGNAME}"
+ export KARAF_SCRIPT
+fi
if [ -f "${DIRNAME}/setenv" ]; then
. "${DIRNAME}/setenv"
fi
diff --git
a/assemblies/features/base/src/main/filtered-resources/resources/bin/start.bat
b/assemblies/features/base/src/main/filtered-resources/resources/bin/start.bat
index 636774e..0db464a 100644
---
a/assemblies/features/base/src/main/filtered-resources/resources/bin/start.bat
+++
b/assemblies/features/base/src/main/filtered-resources/resources/bin/start.bat
@@ -25,7 +25,9 @@ set PROGNAME=%~nx0%
set ARGS=%*
rem Sourcing environment settings for karaf similar to tomcats setenv
-SET KARAF_SCRIPT="start.bat"
+if "%KARAF_SCRIPT%" == "" (
+ SET KARAF_SCRIPT="start.bat"
+)
if exist "%DIRNAME%setenv.bat" (
call "%DIRNAME%setenv.bat"
)
diff --git
a/assemblies/features/base/src/main/filtered-resources/resources/bin/status
b/assemblies/features/base/src/main/filtered-resources/resources/bin/status
index b1eafec..ec9171c 100755
--- a/assemblies/features/base/src/main/filtered-resources/resources/bin/status
+++ b/assemblies/features/base/src/main/filtered-resources/resources/bin/status
@@ -68,8 +68,10 @@ PROGNAME=`basename "${REALNAME}"`
#
# Sourcing environment settings for karaf similar to tomcats setenv
#
-KARAF_SCRIPT="${PROGNAME}"
-export KARAF_SCRIPT
+if [ "x${KARAF_SCRIPT}" = "x" ]; then
+ KARAF_SCRIPT="${PROGNAME}"
+ export KARAF_SCRIPT
+fi
if [ -f "${DIRNAME}/setenv" ]; then
. "${DIRNAME}/setenv"
fi
@@ -96,4 +98,3 @@ main() {
}
main "$@"
-
diff --git
a/assemblies/features/base/src/main/filtered-resources/resources/bin/status.bat
b/assemblies/features/base/src/main/filtered-resources/resources/bin/status.bat
index ec39991..40a19bd 100644
---
a/assemblies/features/base/src/main/filtered-resources/resources/bin/status.bat
+++
b/assemblies/features/base/src/main/filtered-resources/resources/bin/status.bat
@@ -25,7 +25,9 @@ set PROGNAME=%~nx0%
set ARGS=%*
rem Sourcing environment settings for karaf similar to tomcats setenv
-SET KARAF_SCRIPT="status.bat"
+if "%KARAF_SCRIPT%" == "" (
+ SET KARAF_SCRIPT="status.bat"
+)
if exist "%DIRNAME%setenv.bat" (
call "%DIRNAME%setenv.bat"
)
diff --git
a/assemblies/features/base/src/main/filtered-resources/resources/bin/stop
b/assemblies/features/base/src/main/filtered-resources/resources/bin/stop
index 17ff7c7..ef865fe 100755
--- a/assemblies/features/base/src/main/filtered-resources/resources/bin/stop
+++ b/assemblies/features/base/src/main/filtered-resources/resources/bin/stop
@@ -68,8 +68,10 @@ PROGNAME=`basename "${REALNAME}"`
#
# Sourcing environment settings for karaf similar to tomcats setenv
#
-KARAF_SCRIPT="${PROGNAME}"
-export KARAF_SCRIPT
+if [ "x${KARAF_SCRIPT}" = "x" ]; then
+ KARAF_SCRIPT="${PROGNAME}"
+ export KARAF_SCRIPT
+fi
if [ -f "${DIRNAME}/setenv" ]; then
. "${DIRNAME}/setenv"
fi
diff --git
a/assemblies/features/base/src/main/filtered-resources/resources/bin/stop.bat
b/assemblies/features/base/src/main/filtered-resources/resources/bin/stop.bat
index df377ba..1186269 100644
---
a/assemblies/features/base/src/main/filtered-resources/resources/bin/stop.bat
+++
b/assemblies/features/base/src/main/filtered-resources/resources/bin/stop.bat
@@ -25,7 +25,9 @@ set PROGNAME=%~nx0%
set ARGS=%*
rem Sourcing environment settings for karaf similar to tomcats setenv
-SET KARAF_SCRIPT="stop.bat"
+if "%KARAF_SCRIPT%" == "" (
+ SET KARAF_SCRIPT="stop.bat"
+)
if exist "%DIRNAME%setenv.bat" (
call "%DIRNAME%setenv.bat"
)
