This is an automated email from the ASF dual-hosted git repository.
vavrtom pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
The following commit(s) were added to refs/heads/main by this push:
new 651f77e67d QPID-8612: [Broker-J] Changed default Garbage Collector
from CMS to G1 (#162)
651f77e67d is described below
commit 651f77e67d9bd0928482a20dc924e9af07b8e474
Author: vavrtom <[email protected]>
AuthorDate: Fri Nov 11 12:54:32 2022 +0100
QPID-8612: [Broker-J] Changed default Garbage Collector from CMS to G1
(#162)
---
broker/bin/qpid-server | 2 +-
broker/bin/qpid-server.bat | 2 +-
.../src/docbkx/Java-Broker-Appendix-Environment-Variables.xml | 2 +-
.../main/java/org/apache/qpid/tools/MemoryConsumptionTestClient.java | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/broker/bin/qpid-server b/broker/bin/qpid-server
index 0176424041..6b518d9e03 100755
--- a/broker/bin/qpid-server
+++ b/broker/bin/qpid-server
@@ -40,7 +40,7 @@
QPID_LIBS="${QPID_HOME}/lib/*:${QPID_HOME}/lib/plugins/*:${QPID_HOME}/lib/opt/*"
export JAVA=java \
JAVA_VM=-server \
JAVA_MEM="-Xmx512m -XX:MaxDirectMemorySize=1536m" \
- JAVA_GC="-XX:+UseConcMarkSweepGC -XX:+HeapDumpOnOutOfMemoryError" \
+ JAVA_GC="-XX:+UseG1GC -XX:+HeapDumpOnOutOfMemoryError" \
QPID_CLASSPATH="${QPID_LIBS}" \
QPID_RUN_LOG=2
diff --git a/broker/bin/qpid-server.bat b/broker/bin/qpid-server.bat
index 1350d68ef1..8d0305f0b1 100755
--- a/broker/bin/qpid-server.bat
+++ b/broker/bin/qpid-server.bat
@@ -165,7 +165,7 @@ REM end parsing -run arguments
set JAVA_VM=-server
set JAVA_MEM=-Xmx512m -XX:MaxDirectMemorySize=1536m
-set JAVA_GC=-XX:+UseConcMarkSweepGC -XX:+HeapDumpOnOutOfMemoryError
+set JAVA_GC=-XX:+UseG1GC -XX:+HeapDumpOnOutOfMemoryError
REM Use QPID_JAVA_GC if set
if "%QPID_JAVA_GC%" == "" goto noQpidJavaGC
diff --git
a/doc/java-broker/src/docbkx/Java-Broker-Appendix-Environment-Variables.xml
b/doc/java-broker/src/docbkx/Java-Broker-Appendix-Environment-Variables.xml
index dbfe56793c..3351a72fba 100644
--- a/doc/java-broker/src/docbkx/Java-Broker-Appendix-Environment-Variables.xml
+++ b/doc/java-broker/src/docbkx/Java-Broker-Appendix-Environment-Variables.xml
@@ -85,7 +85,7 @@
<row xml:id="Java-Broker-Appendix-Environment-Variables-Qpid-Java-Gc">
<entry>QPID_JAVA_GC</entry>
<entry>
- <literal>-XX:+HeapDumpOnOutOfMemoryError
-XX:+UseConcMarkSweepGC</literal>
+ <literal>-XX:+HeapDumpOnOutOfMemoryError -XX:+UseG1GC</literal>
</entry>
<entry>
<para>This is the preferred mechanism for customising garbage
collection behaviour. The
diff --git
a/tools/src/main/java/org/apache/qpid/tools/MemoryConsumptionTestClient.java
b/tools/src/main/java/org/apache/qpid/tools/MemoryConsumptionTestClient.java
index be431f0ee0..569c9f0ac6 100644
--- a/tools/src/main/java/org/apache/qpid/tools/MemoryConsumptionTestClient.java
+++ b/tools/src/main/java/org/apache/qpid/tools/MemoryConsumptionTestClient.java
@@ -122,7 +122,7 @@ public class MemoryConsumptionTestClient
options.put(JMX_PORT_ARG, JMX_PORT_DEFAULT);
options.put(JMX_USER_ARG, "");
options.put(JMX_USER_PASSWORD_ARG, "");
- options.put(JMX_GARBAGE_COLLECTOR_MBEAN,
"java.lang:type=GarbageCollector,name=ConcurrentMarkSweep");
+ options.put(JMX_GARBAGE_COLLECTOR_MBEAN,
"java.lang:type=GarbageCollector,name=G1 Old Generation");
if(args.length == 1 &&
(args[0].equals("-h") || args[0].equals("--help") ||
args[0].equals("help")))
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
