Repository: cassandra Updated Branches: refs/heads/trunk 3c186bef8 -> 3666e47a1
r/m populate_io_cache_on_flush from yaml (per-table since #4694) Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e5b92d8a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e5b92d8a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e5b92d8a Branch: refs/heads/trunk Commit: e5b92d8ad3b5329d7ba8312eeac54ab9f06153e5 Parents: 3af5e50 Author: Jonathan Ellis <[email protected]> Authored: Fri Feb 28 10:40:07 2014 -0600 Committer: Jonathan Ellis <[email protected]> Committed: Fri Feb 28 10:40:07 2014 -0600 ---------------------------------------------------------------------- conf/cassandra.yaml | 5 ----- src/java/org/apache/cassandra/config/Config.java | 3 +-- 2 files changed, 1 insertion(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e5b92d8a/conf/cassandra.yaml ---------------------------------------------------------------------- diff --git a/conf/cassandra.yaml b/conf/cassandra.yaml index d038cde..194a196 100644 --- a/conf/cassandra.yaml +++ b/conf/cassandra.yaml @@ -57,11 +57,6 @@ max_hints_delivery_threads: 2 # reduced proportionally to the number of nodes in the cluster. batchlog_replay_throttle_in_kb: 1024 -# The following setting populates the page cache on memtable flush and compaction -# WARNING: Enable this setting only when the whole node's data fits in memory. -# Defaults to: false -# populate_io_cache_on_flush: false - # Authentication backend, implementing IAuthenticator; used to identify users # Out of the box, Cassandra provides org.apache.cassandra.auth.{AllowAllAuthenticator, # PasswordAuthenticator}. http://git-wip-us.apache.org/repos/asf/cassandra/blob/e5b92d8a/src/java/org/apache/cassandra/config/Config.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/config/Config.java b/src/java/org/apache/cassandra/config/Config.java index 1c19a85..b0c8b09 100644 --- a/src/java/org/apache/cassandra/config/Config.java +++ b/src/java/org/apache/cassandra/config/Config.java @@ -168,7 +168,7 @@ public class Config public volatile int row_cache_save_period = 0; public int row_cache_keys_to_save = Integer.MAX_VALUE; public String row_cache_provider = SerializingCacheProvider.class.getSimpleName(); - public boolean populate_io_cache_on_flush = false; + public boolean populate_io_cache_on_flush = false; // ignored! see CASSANDRA-4694 public boolean inter_dc_tcp_nodelay = true; @@ -204,7 +204,6 @@ public class Config periodic, batch } - public static enum InternodeCompression { all, none, dc
