You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2014/02/28 17:41:13 UTC
[1/6] git commit: r/m populate_io_cache_on_flush from yaml (per-table
since #4694)
Repository: cassandra
Updated Branches:
refs/heads/cassandra-1.2 3af5e5075 -> e5b92d8ad
refs/heads/cassandra-2.0 319b42e58 -> 5b80b97de
refs/heads/cassandra-2.1 b41eb4ad7 -> a6f5f361c
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/cassandra-1.2
Commit: e5b92d8ad3b5329d7ba8312eeac54ab9f06153e5
Parents: 3af5e50
Author: Jonathan Ellis <jb...@apache.org>
Authored: Fri Feb 28 10:40:07 2014 -0600
Committer: Jonathan Ellis <jb...@apache.org>
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
[4/6] git commit: merge from 1.2
Posted by jb...@apache.org.
merge from 1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5b80b97d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5b80b97d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5b80b97d
Branch: refs/heads/cassandra-2.1
Commit: 5b80b97ded51bcc2bb0cb0a2f3dc0616d0ed4a30
Parents: 319b42e e5b92d8
Author: Jonathan Ellis <jb...@apache.org>
Authored: Fri Feb 28 10:40:43 2014 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Fri Feb 28 10:40:43 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/5b80b97d/conf/cassandra.yaml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5b80b97d/src/java/org/apache/cassandra/config/Config.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/config/Config.java
index 876770c,b0c8b09..e8e43e2
--- a/src/java/org/apache/cassandra/config/Config.java
+++ b/src/java/org/apache/cassandra/config/Config.java
@@@ -179,15 -167,9 +179,15 @@@ public class Confi
public long row_cache_size_in_mb = 0;
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 String memory_allocator = NativeAllocator.class.getSimpleName();
- public boolean populate_io_cache_on_flush = false;
+ public boolean populate_io_cache_on_flush = false; // ignored! see CASSANDRA-4694
+ private static boolean isClientMode = false;
+
+ public boolean preheat_kernel_page_cache = false;
+
+ public Integer file_cache_size_in_mb;
+
public boolean inter_dc_tcp_nodelay = true;
public String memtable_allocator = "SlabAllocator";
[2/6] git commit: r/m populate_io_cache_on_flush from yaml (per-table
since #4694)
Posted by jb...@apache.org.
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/cassandra-2.0
Commit: e5b92d8ad3b5329d7ba8312eeac54ab9f06153e5
Parents: 3af5e50
Author: Jonathan Ellis <jb...@apache.org>
Authored: Fri Feb 28 10:40:07 2014 -0600
Committer: Jonathan Ellis <jb...@apache.org>
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
[6/6] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by jb...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a6f5f361
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a6f5f361
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a6f5f361
Branch: refs/heads/cassandra-2.1
Commit: a6f5f361caeaf0e4a77366dd85ac47940e3a7f85
Parents: b41eb4a 5b80b97
Author: Jonathan Ellis <jb...@apache.org>
Authored: Fri Feb 28 10:40:55 2014 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Fri Feb 28 10:41:12 2014 -0600
----------------------------------------------------------------------
conf/cassandra.yaml | 5 -----
src/java/org/apache/cassandra/config/Config.java | 2 --
2 files changed, 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a6f5f361/conf/cassandra.yaml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a6f5f361/src/java/org/apache/cassandra/config/Config.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/config/Config.java
index b2eedba,e8e43e2..a9b9237
--- a/src/java/org/apache/cassandra/config/Config.java
+++ b/src/java/org/apache/cassandra/config/Config.java
@@@ -187,14 -178,9 +187,13 @@@ public class Confi
public long row_cache_size_in_mb = 0;
public volatile int row_cache_save_period = 0;
- public int row_cache_keys_to_save = Integer.MAX_VALUE;
+ public volatile int row_cache_keys_to_save = Integer.MAX_VALUE;
+
+ public Long counter_cache_size_in_mb = null;
+ public volatile int counter_cache_save_period = 7200;
+ public volatile int counter_cache_keys_to_save = Integer.MAX_VALUE;
+
public String memory_allocator = NativeAllocator.class.getSimpleName();
- public boolean populate_io_cache_on_flush = false;
- public boolean populate_io_cache_on_flush = false; // ignored! see CASSANDRA-4694
private static boolean isClientMode = false;
[5/6] git commit: merge from 1.2
Posted by jb...@apache.org.
merge from 1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5b80b97d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5b80b97d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5b80b97d
Branch: refs/heads/cassandra-2.0
Commit: 5b80b97ded51bcc2bb0cb0a2f3dc0616d0ed4a30
Parents: 319b42e e5b92d8
Author: Jonathan Ellis <jb...@apache.org>
Authored: Fri Feb 28 10:40:43 2014 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Fri Feb 28 10:40:43 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/5b80b97d/conf/cassandra.yaml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5b80b97d/src/java/org/apache/cassandra/config/Config.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/config/Config.java
index 876770c,b0c8b09..e8e43e2
--- a/src/java/org/apache/cassandra/config/Config.java
+++ b/src/java/org/apache/cassandra/config/Config.java
@@@ -179,15 -167,9 +179,15 @@@ public class Confi
public long row_cache_size_in_mb = 0;
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 String memory_allocator = NativeAllocator.class.getSimpleName();
- public boolean populate_io_cache_on_flush = false;
+ public boolean populate_io_cache_on_flush = false; // ignored! see CASSANDRA-4694
+ private static boolean isClientMode = false;
+
+ public boolean preheat_kernel_page_cache = false;
+
+ public Integer file_cache_size_in_mb;
+
public boolean inter_dc_tcp_nodelay = true;
public String memtable_allocator = "SlabAllocator";
[3/6] git commit: r/m populate_io_cache_on_flush from yaml (per-table
since #4694)
Posted by jb...@apache.org.
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/cassandra-2.1
Commit: e5b92d8ad3b5329d7ba8312eeac54ab9f06153e5
Parents: 3af5e50
Author: Jonathan Ellis <jb...@apache.org>
Authored: Fri Feb 28 10:40:07 2014 -0600
Committer: Jonathan Ellis <jb...@apache.org>
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