Merge branch 'cassandra-3.0' into cassandra-3.9
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/76188e95 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/76188e95 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/76188e95 Branch: refs/heads/cassandra-3.8 Commit: 76188e9520d0aed8da287cffd80122e1069ddcae Parents: 56abaca e99ee19 Author: Josh McKenzie <jmcken...@apache.org> Authored: Mon Jul 11 16:29:58 2016 -0400 Committer: Josh McKenzie <jmcken...@apache.org> Committed: Mon Jul 11 16:29:58 2016 -0400 ---------------------------------------------------------------------- conf/cassandra.yaml | 6 ++++++ src/java/org/apache/cassandra/config/Config.java | 1 + .../org/apache/cassandra/config/DatabaseDescriptor.java | 10 ++++++++++ src/java/org/apache/cassandra/service/GCInspector.java | 2 +- 4 files changed, 18 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/76188e95/conf/cassandra.yaml ---------------------------------------------------------------------- diff --cc conf/cassandra.yaml index 076a729,09d2094..d79423e --- a/conf/cassandra.yaml +++ b/conf/cassandra.yaml @@@ -1051,6 -924,16 +1051,12 @@@ inter_dc_tcp_nodelay: fals tracetype_query_ttl: 86400 tracetype_repair_ttl: 604800 + # By default, Cassandra logs GC Pauses greater than 200 ms at INFO level + # This threshold can be adjusted to minimize logging if necessary + # gc_log_threshold_in_ms: 200 + -# GC Pauses greater than gc_warn_threshold_in_ms will be logged at WARN level + # If unset, all GC Pauses greater than gc_log_threshold_in_ms will log at + # INFO level -# Adjust the threshold based on your application throughput requirement -gc_warn_threshold_in_ms: 1000 - # UDFs (user defined functions) are disabled by default. # As of Cassandra 3.0 there is a sandbox in place that should prevent execution of evil code. enable_user_defined_functions: false http://git-wip-us.apache.org/repos/asf/cassandra/blob/76188e95/src/java/org/apache/cassandra/config/Config.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/76188e95/src/java/org/apache/cassandra/config/DatabaseDescriptor.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/config/DatabaseDescriptor.java index 1375a39,100bcf4..38dce11 --- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java +++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java @@@ -2169,11 -1984,11 +2174,16 @@@ public class DatabaseDescripto conf.user_function_timeout_policy = userFunctionTimeoutPolicy; } + public static long getGCLogThreshold() + { + return conf.gc_log_threshold_in_ms; + } + + public static EncryptionContext getEncryptionContext() + { + return encryptionContext; + } + public static long getGCWarnThreshold() { return conf.gc_warn_threshold_in_ms;
