[1/2] activemq-artemis git commit: This closes #2411

classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

[1/2] activemq-artemis git commit: This closes #2411

jbertram
Repository: activemq-artemis
Updated Branches:
  refs/heads/master 280ea56d8 -> 14c41ecfc


This closes #2411


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/14c41ecf
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/14c41ecf
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/14c41ecf

Branch: refs/heads/master
Commit: 14c41ecfcc9469199bf72336be7ab70679dafd12
Parents: 280ea56 cfd520e
Author: Justin Bertram <[hidden email]>
Authored: Thu Dec 13 10:55:30 2018 -0600
Committer: Justin Bertram <[hidden email]>
Committed: Thu Dec 13 10:55:30 2018 -0600

----------------------------------------------------------------------
 .../activemq/artemis/cli/commands/bin/artemis-service.xml   | 1 -
 .../activemq/artemis/cli/commands/etc/artemis.profile       | 2 +-
 .../activemq/artemis/cli/commands/etc/artemis.profile.cmd   | 2 +-
 artemis-distribution/src/main/resources/bin/artemis         | 2 +-
 artemis-distribution/src/main/resources/bin/artemis.cmd     | 2 +-
 docs/user-manual/en/perf-tuning.md                          | 9 +--------
 examples/common/config/server.properties                    | 2 +-
 7 files changed, 6 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


Reply | Threaded
Open this post in threaded view
|

[2/2] activemq-artemis git commit: ARTEMIS-2162 Remove -XX:+AggressiveOpts to improve JDK 11 compatibility

jbertram
ARTEMIS-2162 Remove -XX:+AggressiveOpts to improve JDK 11 compatibility


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/cfd520e3
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/cfd520e3
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/cfd520e3

Branch: refs/heads/master
Commit: cfd520e38c3088f9b2a355a5022ae10c4bf8323f
Parents: 280ea56
Author: Francesco Nigro <[hidden email]>
Authored: Fri Nov 2 15:03:51 2018 +0100
Committer: Justin Bertram <[hidden email]>
Committed: Thu Dec 13 10:55:30 2018 -0600

----------------------------------------------------------------------
 .../activemq/artemis/cli/commands/bin/artemis-service.xml   | 1 -
 .../activemq/artemis/cli/commands/etc/artemis.profile       | 2 +-
 .../activemq/artemis/cli/commands/etc/artemis.profile.cmd   | 2 +-
 artemis-distribution/src/main/resources/bin/artemis         | 2 +-
 artemis-distribution/src/main/resources/bin/artemis.cmd     | 2 +-
 docs/user-manual/en/perf-tuning.md                          | 9 +--------
 examples/common/config/server.properties                    | 2 +-
 7 files changed, 6 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/cfd520e3/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis-service.xml
----------------------------------------------------------------------
diff --git a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis-service.xml b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis-service.xml
index b2c164b..fac8f53 100644
--- a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis-service.xml
+++ b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis-service.xml
@@ -35,7 +35,6 @@
    <executable>%JAVA_HOME%\bin\java.exe</executable>
    <argument>-Xbootclasspath/a:%ARTEMIS_HOME%\lib\${logmanager}</argument>
    <argument>-XX:+UseParallelGC</argument>
-   <argument>-XX:+AggressiveOpts</argument>
    <argument>-Xms512M</argument>
    <argument>-Xmx1024M</argument>
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/cfd520e3/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile
----------------------------------------------------------------------
diff --git a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile
index fb0070a..876b4cb 100644
--- a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile
+++ b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile
@@ -31,7 +31,7 @@ ARTEMIS_INSTANCE_ETC_URI='${artemis.instance.etc.uri}'
 
 
 # Java Opts
-JAVA_ARGS="${java-opts} -XX:+PrintClassHistogram -XX:+UseG1GC -XX:+AggressiveOpts -Xms512M -Xmx2G -Dhawtio.realm=activemq  -Dhawtio.offline="true" -Dhawtio.role=${role} -Dhawtio.rolePrincipalClasses=org.apache.activemq.artemis.spi.core.security.jaas.RolePrincipal -Djolokia.policyLocation=${ARTEMIS_INSTANCE_ETC_URI}jolokia-access.xml"
+JAVA_ARGS="${java-opts} -XX:+PrintClassHistogram -XX:+UseG1GC -Xms512M -Xmx2G -Dhawtio.realm=activemq  -Dhawtio.offline="true" -Dhawtio.role=${role} -Dhawtio.rolePrincipalClasses=org.apache.activemq.artemis.spi.core.security.jaas.RolePrincipal -Djolokia.policyLocation=${ARTEMIS_INSTANCE_ETC_URI}jolokia-access.xml"
 
 #
 # Logs Safepoints JVM pauses: Uncomment to enable them

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/cfd520e3/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile.cmd
----------------------------------------------------------------------
diff --git a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile.cmd b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile.cmd
index a4738bc..af024cb 100644
--- a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile.cmd
+++ b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile.cmd
@@ -32,7 +32,7 @@ rem Cluster Properties: Used to pass arguments to ActiveMQ Artemis which can be
 rem set ARTEMIS_CLUSTER_PROPS=-Dactivemq.remoting.default.port=61617 -Dactivemq.remoting.amqp.port=5673 -Dactivemq.remoting.stomp.port=61614 -Dactivemq.remoting.hornetq.port=5446
 
 rem Java Opts
-set JAVA_ARGS=${java-opts} -XX:+PrintClassHistogram -XX:+UseG1GC -XX:+AggressiveOpts -Xms512M -Xmx1024M -Xbootclasspath/a:%ARTEMIS_HOME%\lib\${logmanager} -Djava.security.auth.login.config=%ARTEMIS_ETC_DIR%\login.config -Dhawtio.offline="true" -Dhawtio.realm=activemq -Dhawtio.role=${role} -Dhawtio.rolePrincipalClasses=org.apache.activemq.artemis.spi.core.security.jaas.RolePrincipal -Djolokia.policyLocation=%ARTEMIS_INSTANCE_ETC_URI%\jolokia-access.xml -Dartemis.instance=%ARTEMIS_INSTANCE%
+set JAVA_ARGS=${java-opts} -XX:+PrintClassHistogram -XX:+UseG1GC -Xms512M -Xmx1024M -Xbootclasspath/a:%ARTEMIS_HOME%\lib\${logmanager} -Djava.security.auth.login.config=%ARTEMIS_ETC_DIR%\login.config -Dhawtio.offline="true" -Dhawtio.realm=activemq -Dhawtio.role=${role} -Dhawtio.rolePrincipalClasses=org.apache.activemq.artemis.spi.core.security.jaas.RolePrincipal -Djolokia.policyLocation=%ARTEMIS_INSTANCE_ETC_URI%\jolokia-access.xml -Dartemis.instance=%ARTEMIS_INSTANCE%
 
 rem Logs Safepoints JVM pauses: Uncomment to enable them
 rem In addition to the traditional GC logs you could enable some JVM flags to know any meaningful and "hidden" pause that could

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/cfd520e3/artemis-distribution/src/main/resources/bin/artemis
----------------------------------------------------------------------
diff --git a/artemis-distribution/src/main/resources/bin/artemis b/artemis-distribution/src/main/resources/bin/artemis
index a7eeade..4b5ebe5 100755
--- a/artemis-distribution/src/main/resources/bin/artemis
+++ b/artemis-distribution/src/main/resources/bin/artemis
@@ -45,7 +45,7 @@ if [ -z "$ARTEMIS_HOME" ] ; then
 fi
 
 # Set Defaults Properties
-JAVA_ARGS="-XX:+UseParallelGC -XX:+AggressiveOpts -Xms512M -Xmx1024M"
+JAVA_ARGS="-XX:+UseParallelGC -Xms512M -Xmx1024M"
 CLASSPATH="$ARTEMIS_HOME/lib/artemis-boot.jar"
 
 # OS specific support.

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/cfd520e3/artemis-distribution/src/main/resources/bin/artemis.cmd
----------------------------------------------------------------------
diff --git a/artemis-distribution/src/main/resources/bin/artemis.cmd b/artemis-distribution/src/main/resources/bin/artemis.cmd
index 24b8c9e..66f4cdb 100755
--- a/artemis-distribution/src/main/resources/bin/artemis.cmd
+++ b/artemis-distribution/src/main/resources/bin/artemis.cmd
@@ -45,7 +45,7 @@ echo.
 :RUN_JAVA
 
 rem "Set Defaults."
-set JAVA_ARGS=-XX:+UseParallelGC -XX:+AggressiveOpts -Xms512M -Xmx1024M
+set JAVA_ARGS=-XX:+UseParallelGC -Xms512M -Xmx1024M
 
 rem "Create full JVM Args"
 set JVM_ARGS=%JAVA_ARGS%

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/cfd520e3/docs/user-manual/en/perf-tuning.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/perf-tuning.md b/docs/user-manual/en/perf-tuning.md
index 19c2595..48b23f3 100644
--- a/docs/user-manual/en/perf-tuning.md
+++ b/docs/user-manual/en/perf-tuning.md
@@ -205,14 +205,7 @@ from other providers (e.g. IBM or JRockit)
   heap size (`-Xmx`) for the JVM is set at least to 5 x the `global-max-size` of
   the broker.  As an example, in a situation where the broker is under high load
   and running with a `global-max-size` of 1GB, it is recommended the the max heap
-  size is set to 5GB.  
-
-- Aggressive options. Different JVMs provide different sets of JVM tuning
-  parameters, for the Sun Hotspot JVM the full list of options is available
-  [here](http://www.oracle.com/technetwork/java/javase/tech/vmoptions-jsp-140102.html).
-  We recommend at least using `-XX:+AggressiveOpts`.  You may get some mileage
-  with the other tuning parameters depending on your OS platform and application
-  usage patterns.
+  size is set to 5GB.
 
 ## Avoiding Anti-Patterns
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/cfd520e3/examples/common/config/server.properties
----------------------------------------------------------------------
diff --git a/examples/common/config/server.properties b/examples/common/config/server.properties
index 345f389..15710a2 100644
--- a/examples/common/config/server.properties
+++ b/examples/common/config/server.properties
@@ -15,4 +15,4 @@
 # specific language governing permissions and limitations
 # under the License.
 
-server.args=-XX:+UseParallelGC -Xms256M -Xmx256M -XX:+AggressiveOpts -Dcom.sun.management.jmxremote -Djava.util.logging.config.file=${imported.basedir}/config/logging.properties -Djava.naming.factory.initial=org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory
+server.args=-XX:+UseParallelGC -Xms256M -Xmx256M -Dcom.sun.management.jmxremote -Djava.util.logging.config.file=${imported.basedir}/config/logging.properties -Djava.naming.factory.initial=org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory