You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by sv...@apache.org on 2016/11/08 06:38:24 UTC
[1/2] brooklyn-dist git commit: Added SoftRefLRUPolicyMSPerMB
Repository: brooklyn-dist
Updated Branches:
refs/heads/master beac349b3 -> 40743fe3a
Added SoftRefLRUPolicyMSPerMB
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/05c01976
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/05c01976
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/05c01976
Branch: refs/heads/master
Commit: 05c019769a74f63b1510d0c6385fe40b40683707
Parents: beac349
Author: Duncan Godwin <du...@cloudsoftcorp.com>
Authored: Mon Nov 7 17:02:58 2016 +0000
Committer: Duncan Godwin <du...@cloudsoftcorp.com>
Committed: Mon Nov 7 17:02:58 2016 +0000
----------------------------------------------------------------------
dist/src/main/dist/bin/brooklyn | 3 +++
dist/src/main/dist/bin/brooklyn.bat | 1 +
karaf/apache-brooklyn/src/main/resources/bin/setenv | 5 ++++-
.../src/main/resources/service/systemd/brooklyn.service | 2 +-
.../src/main/resources/service/upstart/deb/brooklyn.conf | 2 +-
.../src/main/resources/service/upstart/rpm/brooklyn.conf | 2 +-
6 files changed, 11 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/05c01976/dist/src/main/dist/bin/brooklyn
----------------------------------------------------------------------
diff --git a/dist/src/main/dist/bin/brooklyn b/dist/src/main/dist/bin/brooklyn
index 5901aef..2056e96 100755
--- a/dist/src/main/dist/bin/brooklyn
+++ b/dist/src/main/dist/bin/brooklyn
@@ -46,6 +46,9 @@ export INITIAL_CLASSPATH
# TODO should be changed in code
JAVA_OPTS="-Dbrooklyn.location.localhost.address=127.0.0.1 ${JAVA_OPTS}"
+# Increase garbage collection, see https://issues.apache.org/jira/browse/BROOKLYN-375
+JAVA_OPTS="-XX:SoftRefLRUPolicyMSPerMB=1 ${JAVA_OPTS}"
+
# start Brooklyn
echo $$ > "$ROOT/pid_java"
if [[ -n "$JAVA_HOME" && -d "$JAVA_HOME" ]] ; then
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/05c01976/dist/src/main/dist/bin/brooklyn.bat
----------------------------------------------------------------------
diff --git a/dist/src/main/dist/bin/brooklyn.bat b/dist/src/main/dist/bin/brooklyn.bat
index 90e300e..04a816d 100644
--- a/dist/src/main/dist/bin/brooklyn.bat
+++ b/dist/src/main/dist/bin/brooklyn.bat
@@ -75,6 +75,7 @@ IF NOT "%BROOKLYN_CLASSPATH%"=="" SET "INITIAL_CLASSPATH=%BROOKLYN_CLASSPATH%;%I
REM force resolution of localhost to be loopback, otherwise we hit problems
REM TODO should be changed in code
SET JAVA_OPTS=-Dbrooklyn.location.localhost.address=127.0.0.1 %JAVA_OPTS%
+SET JAVA_OPTS=-XX:SoftRefLRUPolicyMSPerMB=1 %JAVA_OPTS%
REM workaround for http://bugs.sun.com/view_bug.do?bug_id=4787931
SET JAVA_OPTS=-Duser.home="%USERPROFILE%" %JAVA_OPTS%
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/05c01976/karaf/apache-brooklyn/src/main/resources/bin/setenv
----------------------------------------------------------------------
diff --git a/karaf/apache-brooklyn/src/main/resources/bin/setenv b/karaf/apache-brooklyn/src/main/resources/bin/setenv
index a0a6019..f7a096d 100644
--- a/karaf/apache-brooklyn/src/main/resources/bin/setenv
+++ b/karaf/apache-brooklyn/src/main/resources/bin/setenv
@@ -76,4 +76,7 @@ if [ "x$JAVA" = "x" ]; then
fi
# force resolution of localhost to be loopback
-export EXTRA_JAVA_OPTS="-Dbrooklyn.location.localhost.address=127.0.0.1 ${EXTRA_JAVA_OPTS}"
\ No newline at end of file
+export EXTRA_JAVA_OPTS="-Dbrooklyn.location.localhost.address=127.0.0.1 ${EXTRA_JAVA_OPTS}"
+
+# Increase garbage collection, see https://issues.apache.org/jira/browse/BROOKLYN-375
+export EXTRA_JAVA_OPTS="-XX:SoftRefLRUPolicyMSPerMB=1 ${EXTRA_JAVA_OPTS}"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/05c01976/shared-packaging/src/main/resources/service/systemd/brooklyn.service
----------------------------------------------------------------------
diff --git a/shared-packaging/src/main/resources/service/systemd/brooklyn.service b/shared-packaging/src/main/resources/service/systemd/brooklyn.service
index 5986555..f2e2f26 100644
--- a/shared-packaging/src/main/resources/service/systemd/brooklyn.service
+++ b/shared-packaging/src/main/resources/service/systemd/brooklyn.service
@@ -22,7 +22,7 @@ Documentation=https://brooklyn.apache.org/documentation/index.html
[Service]
Type=simple
WorkingDirectory=/opt/brooklyn/
-Environment="JAVA_OPTS=-Dbrooklyn.location.localhost.address=127.0.0.1 -Dlogback.configurationFile=/etc/brooklyn/logback.xml -Xms256m -Xmx1g -XX:MaxPermSize=256m"
+Environment="JAVA_OPTS=-Dbrooklyn.location.localhost.address=127.0.0.1 -XX:SoftRefLRUPolicyMSPerMB=1 -Dlogback.configurationFile=/etc/brooklyn/logback.xml -Xms256m -Xmx1g -XX:MaxPermSize=256m"
Environment="CLASSPATH=/opt/brooklyn/conf:/opt/brooklyn/lib/patch/*:/opt/brooklyn/lib/brooklyn/*:/opt/brooklyn/lib/dropins/*"
ExecStart=/usr/bin/java $JAVA_OPTS -cp "$CLASSPATH" org.apache.brooklyn.cli.Main launch --noGlobalBrooklynProperties --localBrooklynProperties /etc/brooklyn/brooklyn.conf --persist auto
Restart=always
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/05c01976/shared-packaging/src/main/resources/service/upstart/deb/brooklyn.conf
----------------------------------------------------------------------
diff --git a/shared-packaging/src/main/resources/service/upstart/deb/brooklyn.conf b/shared-packaging/src/main/resources/service/upstart/deb/brooklyn.conf
index 63c454e..1fc7cdf 100644
--- a/shared-packaging/src/main/resources/service/upstart/deb/brooklyn.conf
+++ b/shared-packaging/src/main/resources/service/upstart/deb/brooklyn.conf
@@ -34,7 +34,7 @@ end script
script
BROOKLYN_HOME="/opt/brooklyn/"
- JAVA_OPTS="-Dbrooklyn.location.localhost.address=127.0.0.1 -Dlogback.configurationFile=/etc/brooklyn/logback.xml -Xms256m -Xmx1g -XX:MaxPermSize=256m"
+ JAVA_OPTS="-Dbrooklyn.location.localhost.address=127.0.0.1 -XX:SoftRefLRUPolicyMSPerMB=1 -Dlogback.configurationFile=/etc/brooklyn/logback.xml -Xms256m -Xmx1g -XX:MaxPermSize=256m"
CLASSPATH="/opt/brooklyn/conf:/opt/brooklyn/lib/patch/*:/opt/brooklyn/lib/brooklyn/*:/opt/brooklyn/lib/dropins/*"
export BROOKLYN_HOME
exec java ${JAVA_OPTS} -cp "${CLASSPATH}" org.apache.brooklyn.cli.Main launch --noGlobalBrooklynProperties --localBrooklynProperties /etc/brooklyn/brooklyn.conf --persist auto
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/05c01976/shared-packaging/src/main/resources/service/upstart/rpm/brooklyn.conf
----------------------------------------------------------------------
diff --git a/shared-packaging/src/main/resources/service/upstart/rpm/brooklyn.conf b/shared-packaging/src/main/resources/service/upstart/rpm/brooklyn.conf
index 77beb54..7ac01de 100644
--- a/shared-packaging/src/main/resources/service/upstart/rpm/brooklyn.conf
+++ b/shared-packaging/src/main/resources/service/upstart/rpm/brooklyn.conf
@@ -31,7 +31,7 @@ end script
script
BROOKLYN_HOME="/opt/brooklyn/"
- JAVA_OPTS="-Dbrooklyn.location.localhost.address=127.0.0.1 -Dlogback.configurationFile=/etc/brooklyn/logback.xml -Xms256m -Xmx1g -XX:MaxPermSize=256m"
+ JAVA_OPTS="-Dbrooklyn.location.localhost.address=127.0.0.1 -XX:SoftRefLRUPolicyMSPerMB=1 -Dlogback.configurationFile=/etc/brooklyn/logback.xml -Xms256m -Xmx1g -XX:MaxPermSize=256m"
CLASSPATH="/opt/brooklyn/conf:/opt/brooklyn/lib/patch/*:/opt/brooklyn/lib/brooklyn/*:/opt/brooklyn/lib/dropins/*"
export BROOKLYN_HOME
# Upstart is too old on CentOS 6, at least v1.4 required to use setuid, setgid.
[2/2] brooklyn-dist git commit: Closes #58
Posted by sv...@apache.org.
Closes #58
Adds SoftRefLRUPolicyMSPerMB
Adds the java opt `-XX:SoftRefLRUPolicyMSPerMB=1` when launching brooklyn. see [BROOKLYN-375](https://issues.apache.org/jira/browse/BROOKLYN-375) for further details.
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/40743fe3
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/40743fe3
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/40743fe3
Branch: refs/heads/master
Commit: 40743fe3a8eae370cb24f295351c0cdf471b4628
Parents: beac349 05c0197
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Tue Nov 8 08:38:03 2016 +0200
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Tue Nov 8 08:38:03 2016 +0200
----------------------------------------------------------------------
dist/src/main/dist/bin/brooklyn | 3 +++
dist/src/main/dist/bin/brooklyn.bat | 1 +
karaf/apache-brooklyn/src/main/resources/bin/setenv | 5 ++++-
.../src/main/resources/service/systemd/brooklyn.service | 2 +-
.../src/main/resources/service/upstart/deb/brooklyn.conf | 2 +-
.../src/main/resources/service/upstart/rpm/brooklyn.conf | 2 +-
6 files changed, 11 insertions(+), 4 deletions(-)
----------------------------------------------------------------------