You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by be...@apache.org on 2015/01/28 23:44:59 UTC
[1/3] cassandra git commit: ninja remove
commitlog_periodic_queue_size from cassandra.yaml,
and @Deprecate in Config.java
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 97c54c50c -> 160cbc127
refs/heads/trunk 0af4ae293 -> a1f65c34f
ninja remove commitlog_periodic_queue_size from cassandra.yaml, and @Deprecate in Config.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/160cbc12
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/160cbc12
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/160cbc12
Branch: refs/heads/cassandra-2.1
Commit: 160cbc1276503a50fe42f63996211094da5cafbd
Parents: 97c54c5
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Wed Jan 28 22:44:35 2015 +0000
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Wed Jan 28 22:44:35 2015 +0000
----------------------------------------------------------------------
conf/cassandra.yaml | 6 +-----
src/java/org/apache/cassandra/config/Config.java | 4 +++-
2 files changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/160cbc12/conf/cassandra.yaml
----------------------------------------------------------------------
diff --git a/conf/cassandra.yaml b/conf/cassandra.yaml
index a58b596..0b114aa 100644
--- a/conf/cassandra.yaml
+++ b/conf/cassandra.yaml
@@ -236,13 +236,9 @@ counter_cache_save_period: 7200
#
# the other option is "periodic" where writes may be acked immediately
# and the CommitLog is simply synced every commitlog_sync_period_in_ms
-# milliseconds. commitlog_periodic_queue_size allows 1024*(CPU cores) pending
-# entries on the commitlog queue by default. If you are writing very large
-# blobs, you should reduce that; 16*cores works reasonably well for 1MB blobs.
-# It should be at least as large as the concurrent_writes setting.
+# milliseconds.
commitlog_sync: periodic
commitlog_sync_period_in_ms: 10000
-# commitlog_periodic_queue_size:
# The size of the individual commitlog file segments. A commitlog
# segment may be archived, deleted, or recycled once all the data
http://git-wip-us.apache.org/repos/asf/cassandra/blob/160cbc12/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 a78cd63..4c1a2c4 100644
--- a/src/java/org/apache/cassandra/config/Config.java
+++ b/src/java/org/apache/cassandra/config/Config.java
@@ -153,7 +153,9 @@ public class Config
public Double commitlog_sync_batch_window_in_ms;
public Integer commitlog_sync_period_in_ms;
public int commitlog_segment_size_in_mb = 32;
- public int commitlog_periodic_queue_size = 1024 * FBUtilities.getAvailableProcessors();
+
+ @Deprecated
+ public int commitlog_periodic_queue_size = -1;
public String endpoint_snitch;
public Boolean dynamic_snitch = true;
[2/3] cassandra git commit: ninja remove
commitlog_periodic_queue_size from cassandra.yaml,
and @Deprecate in Config.java
Posted by be...@apache.org.
ninja remove commitlog_periodic_queue_size from cassandra.yaml, and @Deprecate in Config.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/160cbc12
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/160cbc12
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/160cbc12
Branch: refs/heads/trunk
Commit: 160cbc1276503a50fe42f63996211094da5cafbd
Parents: 97c54c5
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Wed Jan 28 22:44:35 2015 +0000
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Wed Jan 28 22:44:35 2015 +0000
----------------------------------------------------------------------
conf/cassandra.yaml | 6 +-----
src/java/org/apache/cassandra/config/Config.java | 4 +++-
2 files changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/160cbc12/conf/cassandra.yaml
----------------------------------------------------------------------
diff --git a/conf/cassandra.yaml b/conf/cassandra.yaml
index a58b596..0b114aa 100644
--- a/conf/cassandra.yaml
+++ b/conf/cassandra.yaml
@@ -236,13 +236,9 @@ counter_cache_save_period: 7200
#
# the other option is "periodic" where writes may be acked immediately
# and the CommitLog is simply synced every commitlog_sync_period_in_ms
-# milliseconds. commitlog_periodic_queue_size allows 1024*(CPU cores) pending
-# entries on the commitlog queue by default. If you are writing very large
-# blobs, you should reduce that; 16*cores works reasonably well for 1MB blobs.
-# It should be at least as large as the concurrent_writes setting.
+# milliseconds.
commitlog_sync: periodic
commitlog_sync_period_in_ms: 10000
-# commitlog_periodic_queue_size:
# The size of the individual commitlog file segments. A commitlog
# segment may be archived, deleted, or recycled once all the data
http://git-wip-us.apache.org/repos/asf/cassandra/blob/160cbc12/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 a78cd63..4c1a2c4 100644
--- a/src/java/org/apache/cassandra/config/Config.java
+++ b/src/java/org/apache/cassandra/config/Config.java
@@ -153,7 +153,9 @@ public class Config
public Double commitlog_sync_batch_window_in_ms;
public Integer commitlog_sync_period_in_ms;
public int commitlog_segment_size_in_mb = 32;
- public int commitlog_periodic_queue_size = 1024 * FBUtilities.getAvailableProcessors();
+
+ @Deprecated
+ public int commitlog_periodic_queue_size = -1;
public String endpoint_snitch;
public Boolean dynamic_snitch = true;
[3/3] cassandra git commit: Merge branch 'cassandra-2.1' into trunk
Posted by be...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a1f65c34
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a1f65c34
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a1f65c34
Branch: refs/heads/trunk
Commit: a1f65c34fb6ae0f05545a603191938669e63c83c
Parents: 0af4ae2 160cbc1
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Wed Jan 28 22:44:41 2015 +0000
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Wed Jan 28 22:44:41 2015 +0000
----------------------------------------------------------------------
conf/cassandra.yaml | 6 +-----
src/java/org/apache/cassandra/config/Config.java | 4 +++-
2 files changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a1f65c34/conf/cassandra.yaml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a1f65c34/src/java/org/apache/cassandra/config/Config.java
----------------------------------------------------------------------