You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by du...@apache.org on 2021/03/25 09:28:50 UTC
[brooklyn-dist] branch fix/ignored-mem-settings created (now
bdf354e)
This is an automated email from the ASF dual-hosted git repository.
duncangrant pushed a change to branch fix/ignored-mem-settings
in repository https://gitbox.apache.org/repos/asf/brooklyn-dist.git.
at bdf354e JAVA_MAX_MEM ignored so add to EXTRA_JAVA_OPTS
This branch includes the following new commits:
new bdf354e JAVA_MAX_MEM ignored so add to EXTRA_JAVA_OPTS
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[brooklyn-dist] 01/01: JAVA_MAX_MEM ignored so add to
EXTRA_JAVA_OPTS
Posted by du...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
duncangrant pushed a commit to branch fix/ignored-mem-settings
in repository https://gitbox.apache.org/repos/asf/brooklyn-dist.git
commit bdf354eb4137a7d60f80f38cf9ac83735b3221dc
Author: Duncan Grant <du...@cloudsoft.io>
AuthorDate: Thu Mar 25 09:26:34 2021 +0000
JAVA_MAX_MEM ignored so add to EXTRA_JAVA_OPTS
JAVA_MAX_PERM_MEM no longer supported by java so removed.
---
karaf/apache-brooklyn/src/main/resources/bin/setenv | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/karaf/apache-brooklyn/src/main/resources/bin/setenv b/karaf/apache-brooklyn/src/main/resources/bin/setenv
index 79e890c..cd511a6 100644
--- a/karaf/apache-brooklyn/src/main/resources/bin/setenv
+++ b/karaf/apache-brooklyn/src/main/resources/bin/setenv
@@ -20,9 +20,6 @@
if [ -z "${JAVA_MAX_MEM}" ] ; then
export JAVA_MAX_MEM="2G"
fi
-if [ -z "${JAVA_MAX_PERM_MEM}" ] ; then
- export JAVA_MAX_PERM_MEM="256m"
-fi
# use the default DNS TTL, if not specified
if [ -z "${DNS_TTL}" ] ; then
export DNS_TTL="60"
@@ -100,3 +97,6 @@ export EXTRA_JAVA_OPTS="-Dhttps.protocols=TLSv1.1,TLSv1.2 ${EXTRA_JAVA_OPTS}"
# Set the persistence directory
export EXTRA_JAVA_OPTS="-Dbrooklyn.persistence.dir=${BROOKLYN_PERSISTENCE_DIR} ${EXTRA_JAVA_OPTS}"
+
+# Set the memory available to AMP
+export EXTRA_JAVA_OPTS="-Xmx${JAVA_MAX_MEM} ${EXTRA_JAVA_OPTS}"
\ No newline at end of file