Merge branch 'cassandra-3.11' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d569c831 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d569c831 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d569c831 Branch: refs/heads/trunk Commit: d569c831cbcc7c999b97c332178ae03ac45f9546 Parents: 7a40abb c000827 Author: Jason Brown <jasedbr...@gmail.com> Authored: Wed Dec 13 19:52:58 2017 -0800 Committer: Jason Brown <jasedbr...@gmail.com> Committed: Wed Dec 13 19:53:42 2017 -0800 ---------------------------------------------------------------------- CHANGES.txt | 1 + conf/cassandra.yaml | 8 - .../org/apache/cassandra/config/Config.java | 1 - .../cassandra/config/DatabaseDescriptor.java | 10 - .../db/commitlog/AbstractCommitLogService.java | 215 +++++++++++-------- .../db/commitlog/PeriodicCommitLogService.java | 3 +- .../commitlog/AbstractCommitLogServiceTest.java | 166 ++++++++++++++ .../commitlog/CommitLogChainedMarkersTest.java | 1 - .../CommitLogSegmentBackpressureTest.java | 9 +- 9 files changed, 295 insertions(+), 119 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d569c831/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d569c831/conf/cassandra.yaml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d569c831/src/java/org/apache/cassandra/config/Config.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/config/Config.java index 4fa3bed,a01203c..1db8217 --- a/src/java/org/apache/cassandra/config/Config.java +++ b/src/java/org/apache/cassandra/config/Config.java @@@ -185,14 -198,8 +185,13 @@@ public class Confi public String commitlog_directory; public Integer commitlog_total_space_in_mb; public CommitLogSync commitlog_sync; + + /** + * @deprecated since 4.0 This value was near useless, and we're not using it anymore + */ public double commitlog_sync_batch_window_in_ms = Double.NaN; + public double commitlog_sync_group_window_in_ms = Double.NaN; public int commitlog_sync_period_in_ms; - public int commitlog_marker_period_in_ms = 0; public int commitlog_segment_size_in_mb = 32; public ParameterizedClass commitlog_compression; public int commitlog_max_compression_buffers_in_pool = 3; http://git-wip-us.apache.org/repos/asf/cassandra/blob/d569c831/src/java/org/apache/cassandra/config/DatabaseDescriptor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d569c831/test/unit/org/apache/cassandra/db/commitlog/CommitLogChainedMarkersTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d569c831/test/unit/org/apache/cassandra/db/commitlog/CommitLogSegmentBackpressureTest.java ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
