Skip to content
Permalink
Browse files
Move to Java 8, remove MaxPermSize options
  • Loading branch information
neykov committed May 19, 2017
1 parent 2f48a59 commit eb02fac7e19c0274ecdec9f43fffb603bfeead8c
Showing 9 changed files with 8 additions and 10 deletions.
@@ -1 +1 @@
-Xmx1024m -Xms512m -XX:MaxPermSize=256m
-Xmx1024m -Xms512m
@@ -31,7 +31,7 @@ export ROOT BROOKLYN_HOME

# use default memory settings, if not specified
if [ -z "${JAVA_OPTS}" ] ; then
JAVA_OPTS="-Xms256m -Xmx1g -XX:MaxPermSize=256m"
JAVA_OPTS="-Xms256m -Xmx1g"
fi

# set up the classpath
@@ -65,7 +65,7 @@ IF NOT DEFINED JAVA_BIN (
)

REM use default memory settings, if not specified
IF "%JAVA_OPTS%"=="" SET JAVA_OPTS=-Xms256m -Xmx500m -XX:MaxPermSize=256m
IF "%JAVA_OPTS%"=="" SET JAVA_OPTS=-Xms256m -Xmx1g

REM set up the classpath
SET INITIAL_CLASSPATH=%BROOKLYN_HOME%conf;%BROOKLYN_HOME%lib\patch\*;%BROOKLYN_HOME%lib\brooklyn\*;%BROOKLYN_HOME%lib\dropins\*
@@ -103,7 +103,7 @@ $javaargs = @()

# add the user's java opts, or use default memory settings, if not specified
if ( $env:JAVA_OPTS -eq $null ) {
$javaargs +="-Xms256m -Xmx1g -XX:MaxPermSize=256m"
$javaargs +="-Xms256m -Xmx1g"
} else {
$javaargs +=$env:JAVA_OPTS
}
@@ -28,8 +28,6 @@ WORKDIR /home/brooklyn
# now install software brooklyn
COPY target/files/ .
RUN \
# remove option not relevan for java v8 \
sed -i.bk "s/ -XX:MaxPermSize=256m//" bin/brooklyn ; \
# install br for global use \
cp ./bin/br /usr/bin/br ; \
# and fix perms (irritating that docker won't do this) \
@@ -313,7 +313,7 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>-Xms256m -Xmx512m -XX:MaxPermSize=512m</argLine>
<argLine>-Xms256m -Xmx512m</argLine>
<properties>
<property>
<name>listener</name>
@@ -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 -XX:SoftRefLRUPolicyMSPerMB=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"
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
@@ -34,7 +34,7 @@ end script

script
BROOKLYN_HOME="/opt/brooklyn/"
JAVA_OPTS="-Dbrooklyn.location.localhost.address=127.0.0.1 -XX:SoftRefLRUPolicyMSPerMB=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"
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
@@ -31,7 +31,7 @@ end script

script
BROOKLYN_HOME="/opt/brooklyn/"
JAVA_OPTS="-Dbrooklyn.location.localhost.address=127.0.0.1 -XX:SoftRefLRUPolicyMSPerMB=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"
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.

0 comments on commit eb02fac

Please sign in to comment.