This is an automated email from the ASF dual-hosted git repository.
vgalaxies pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-hugegraph.git
The following commit(s) were added to refs/heads/master by this push:
new 29ecc0492 chore(dist): replace G1 config & handle other gc options
(#2664)
29ecc0492 is described below
commit 29ecc0492ead34a05c384b1aa14927b9aa251b5e
Author: MingzhenHan <[email protected]>
AuthorDate: Thu Oct 10 20:29:13 2024 +0800
chore(dist): replace G1 config & handle other gc options (#2664)
---
.../src/assembly/static/bin/start-hugegraph-pd.sh | 14 ++++++++++----
.../src/assembly/static/bin/hugegraph-server.sh | 7 +++----
.../src/assembly/static/bin/start-hugegraph-store.sh | 16 +++++++++++-----
3 files changed, 24 insertions(+), 13 deletions(-)
diff --git
a/hugegraph-pd/hg-pd-dist/src/assembly/static/bin/start-hugegraph-pd.sh
b/hugegraph-pd/hg-pd-dist/src/assembly/static/bin/start-hugegraph-pd.sh
index 151465ec6..b5d5346f3 100644
--- a/hugegraph-pd/hg-pd-dist/src/assembly/static/bin/start-hugegraph-pd.sh
+++ b/hugegraph-pd/hg-pd-dist/src/assembly/static/bin/start-hugegraph-pd.sh
@@ -101,14 +101,20 @@ fi
# Using G1GC as the default garbage collector (Recommended for large memory
machines)
case "$GC_OPTION" in
- g1)
+ "")
echo "Using G1GC as the default garbage collector"
- JAVA_OPTIONS="${JAVA_OPTIONS} -XX:+UseG1GC -XX:+ParallelRefProcEnabled
\
+ JAVA_OPTIONS="${JAVA_OPTIONS} -XX:+ParallelRefProcEnabled \
-XX:InitiatingHeapOccupancyPercent=50
-XX:G1RSetUpdatingPauseTimePercent=5"
;;
- "") ;;
+ zgc|ZGC)
+ echo "Using ZGC as the default garbage collector (Only support Java
11+)"
+ JAVA_OPTIONS="${JAVA_OPTIONS} -XX:+UseZGC
-XX:+UnlockExperimentalVMOptions \
+ -XX:ConcGCThreads=2
-XX:ParallelGCThreads=6 \
+ -XX:ZCollectionInterval=120
-XX:ZAllocationSpikeTolerance=5 \
+ -XX:+UnlockDiagnosticVMOptions
-XX:-ZProactive"
+ ;;
*)
- echo "Unrecognized gc option: '$GC_OPTION', only support 'g1' now" >>
${OUTPUT}
+ echo "Unrecognized gc option: '$GC_OPTION', default use g1, options
only support 'ZGC' now" >> ${OUTPUT}
exit 1
esac
diff --git
a/hugegraph-server/hugegraph-dist/src/assembly/static/bin/hugegraph-server.sh
b/hugegraph-server/hugegraph-dist/src/assembly/static/bin/hugegraph-server.sh
index 8b6a16d5a..857b9b535 100644
---
a/hugegraph-server/hugegraph-dist/src/assembly/static/bin/hugegraph-server.sh
+++
b/hugegraph-server/hugegraph-dist/src/assembly/static/bin/hugegraph-server.sh
@@ -121,9 +121,9 @@ fi
# Using G1GC as the default garbage collector (Recommended for large memory
machines)
# mention: zgc is only available on ARM-Mac with java > 13
case "$GC_OPTION" in
- g1|G1|g1gc)
+ "")
echo "Using G1GC as the default garbage collector"
- JAVA_OPTIONS="${JAVA_OPTIONS} -XX:+UseG1GC -XX:+ParallelRefProcEnabled
\
+ JAVA_OPTIONS="${JAVA_OPTIONS} -XX:+ParallelRefProcEnabled \
-XX:InitiatingHeapOccupancyPercent=50 \
-XX:G1RSetUpdatingPauseTimePercent=5"
;;
@@ -134,9 +134,8 @@ case "$GC_OPTION" in
-XX:ZCollectionInterval=120
-XX:ZAllocationSpikeTolerance=5 \
-XX:+UnlockDiagnosticVMOptions
-XX:-ZProactive"
;;
- "") ;;
*)
- echo "Unrecognized gc option: '$GC_OPTION', only support 'G1/ZGC' now"
>> ${OUTPUT}
+ echo "Unrecognized gc option: '$GC_OPTION', default use g1, options
only support 'ZGC' now" >> ${OUTPUT}
exit 1
esac
diff --git
a/hugegraph-store/hg-store-dist/src/assembly/static/bin/start-hugegraph-store.sh
b/hugegraph-store/hg-store-dist/src/assembly/static/bin/start-hugegraph-store.sh
index d70f2fbd1..d8b965a07 100644
---
a/hugegraph-store/hg-store-dist/src/assembly/static/bin/start-hugegraph-store.sh
+++
b/hugegraph-store/hg-store-dist/src/assembly/static/bin/start-hugegraph-store.sh
@@ -144,7 +144,7 @@ if [ "$JAVA_OPTIONS" = "" ]; then
>> ${OUTPUT}
exit 1
fi
- JAVA_OPTIONS="-Xms${MIN_MEM}m -Xmx${XMX}m -XX:MetaspaceSize=256M
-XX:+UseG1GC -XX:+ParallelRefProcEnabled -XX:+HeapDumpOnOutOfMemoryError
-XX:HeapDumpPath=${LOGS} ${USER_OPTION} "
+ JAVA_OPTIONS="-Xms${MIN_MEM}m -Xmx${XMX}m -XX:MetaspaceSize=256M
-XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=${LOGS} ${USER_OPTION} "
# JAVA_OPTIONS="-Xms${MIN_MEM}m -Xmx${XMX}m
-XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=${LOGS} ${USER_OPTION}"
# Rolling out detailed GC logs
@@ -153,14 +153,20 @@ fi
# Using G1GC as the default garbage collector (Recommended for large memory
machines)
case "$GC_OPTION" in
- g1)
+ "")
echo "Using G1GC as the default garbage collector"
- JAVA_OPTIONS="${JAVA_OPTIONS} -XX:+UseG1GC -XX:+ParallelRefProcEnabled
\
+ JAVA_OPTIONS="${JAVA_OPTIONS} -XX:+ParallelRefProcEnabled \
-XX:InitiatingHeapOccupancyPercent=50
-XX:G1RSetUpdatingPauseTimePercent=5"
;;
- "") ;;
+ zgc|ZGC)
+ echo "Using ZGC as the default garbage collector (Only support Java
11+)"
+ JAVA_OPTIONS="${JAVA_OPTIONS} -XX:+UseZGC
-XX:+UnlockExperimentalVMOptions \
+ -XX:ConcGCThreads=2
-XX:ParallelGCThreads=6 \
+ -XX:ZCollectionInterval=120
-XX:ZAllocationSpikeTolerance=5 \
+ -XX:+UnlockDiagnosticVMOptions
-XX:-ZProactive"
+ ;;
*)
- echo "Unrecognized gc option: '$GC_OPTION', only support 'g1' now" >>
${OUTPUT}
+ echo "Unrecognized gc option: '$GC_OPTION', default use g1, options
only support 'ZGC' now" >> ${OUTPUT}
exit 1
esac
