Repository: cassandra Updated Branches: refs/heads/trunk d78310d53 -> ed806594e
Revert 4.0 GC alg back to CMS patch by jasobrown; reviewed by Jordan West for CASSANDRA-14636 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ed806594 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ed806594 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ed806594 Branch: refs/heads/trunk Commit: ed806594e5169458d744a06c73ec224a1f37abce Parents: d78310d Author: Jason Brown <jasedbr...@gmail.com> Authored: Fri Aug 10 07:09:55 2018 -0700 Committer: Jason Brown <jasedbr...@gmail.com> Committed: Fri Aug 10 10:44:05 2018 -0700 ---------------------------------------------------------------------- CHANGES.txt | 1 + conf/jvm11-server.options | 29 ++++++++++++++--------------- conf/jvm8-server.options | 30 +++++++++++++++--------------- 3 files changed, 30 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed806594/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index b9fe48b..6a45f95 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 4.0 + * Revert 4.0 GC alg back to CMS (CASANDRA-14636) * Remove hardcoded java11 jvm args in idea workspace files (CASSANDRA-14627) * Update netty to 4.1.128 (CASSANDRA-14633) * Add a virtual table to expose thread pools (CASSANDRA-14523) http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed806594/conf/jvm11-server.options ---------------------------------------------------------------------- diff --git a/conf/jvm11-server.options b/conf/jvm11-server.options index 08a7f2e..e6c2571 100644 --- a/conf/jvm11-server.options +++ b/conf/jvm11-server.options @@ -11,35 +11,34 @@ ### CMS Settings -#-XX:+UseParNewGC -#-XX:+UseConcMarkSweepGC -#-XX:+CMSParallelRemarkEnabled -#-XX:SurvivorRatio=8 -#-XX:MaxTenuringThreshold=1 -#-XX:CMSInitiatingOccupancyFraction=75 -#-XX:+UseCMSInitiatingOccupancyOnly -#-XX:CMSWaitDuration=10000 -#-XX:+CMSParallelInitialMarkEnabled -#-XX:+CMSEdenChunksRecordAlways +-XX:+UseConcMarkSweepGC +-XX:+CMSParallelRemarkEnabled +-XX:SurvivorRatio=8 +-XX:MaxTenuringThreshold=1 +-XX:CMSInitiatingOccupancyFraction=75 +-XX:+UseCMSInitiatingOccupancyOnly +-XX:CMSWaitDuration=10000 +-XX:+CMSParallelInitialMarkEnabled +-XX:+CMSEdenChunksRecordAlways ## some JVMs will fill up their heap when accessed via JMX, see CASSANDRA-6541 -#-XX:+CMSClassUnloadingEnabled +-XX:+CMSClassUnloadingEnabled ### G1 Settings ## Use the Hotspot garbage-first collector. --XX:+UseG1GC --XX:+ParallelRefProcEnabled +#-XX:+UseG1GC +#-XX:+ParallelRefProcEnabled # ## Have the JVM do less remembered set work during STW, instead ## preferring concurrent GC. Reduces p99.9 latency. --XX:G1RSetUpdatingPauseTimePercent=5 +#-XX:G1RSetUpdatingPauseTimePercent=5 # ## Main G1GC tunable: lowering the pause target will lower throughput and vise versa. ## 200ms is the JVM default and lowest viable setting ## 1000ms increases throughput. Keep it smaller than the timeouts in cassandra.yaml. --XX:MaxGCPauseMillis=500 +#-XX:MaxGCPauseMillis=500 ## Optional G1 Settings # Save CPU time on large (>= 16GB) heaps by delaying region scanning http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed806594/conf/jvm8-server.options ---------------------------------------------------------------------- diff --git a/conf/jvm8-server.options b/conf/jvm8-server.options index 14d0261..6214669 100644 --- a/conf/jvm8-server.options +++ b/conf/jvm8-server.options @@ -18,33 +18,33 @@ ################# ### CMS Settings -#-XX:+UseParNewGC -#-XX:+UseConcMarkSweepGC -#-XX:+CMSParallelRemarkEnabled -#-XX:SurvivorRatio=8 -#-XX:MaxTenuringThreshold=1 -#-XX:CMSInitiatingOccupancyFraction=75 -#-XX:+UseCMSInitiatingOccupancyOnly -#-XX:CMSWaitDuration=10000 -#-XX:+CMSParallelInitialMarkEnabled -#-XX:+CMSEdenChunksRecordAlways +-XX:+UseParNewGC +-XX:+UseConcMarkSweepGC +-XX:+CMSParallelRemarkEnabled +-XX:SurvivorRatio=8 +-XX:MaxTenuringThreshold=1 +-XX:CMSInitiatingOccupancyFraction=75 +-XX:+UseCMSInitiatingOccupancyOnly +-XX:CMSWaitDuration=10000 +-XX:+CMSParallelInitialMarkEnabled +-XX:+CMSEdenChunksRecordAlways ## some JVMs will fill up their heap when accessed via JMX, see CASSANDRA-6541 -#-XX:+CMSClassUnloadingEnabled +-XX:+CMSClassUnloadingEnabled ### G1 Settings ## Use the Hotspot garbage-first collector. --XX:+UseG1GC --XX:+ParallelRefProcEnabled +#-XX:+UseG1GC +#-XX:+ParallelRefProcEnabled # ## Have the JVM do less remembered set work during STW, instead ## preferring concurrent GC. Reduces p99.9 latency. --XX:G1RSetUpdatingPauseTimePercent=5 +#-XX:G1RSetUpdatingPauseTimePercent=5 # ## Main G1GC tunable: lowering the pause target will lower throughput and vise versa. ## 200ms is the JVM default and lowest viable setting ## 1000ms increases throughput. Keep it smaller than the timeouts in cassandra.yaml. --XX:MaxGCPauseMillis=500 +#-XX:MaxGCPauseMillis=500 ## Optional G1 Settings # Save CPU time on large (>= 16GB) heaps by delaying region scanning --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
