You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sn...@apache.org on 2017/03/01 10:08:27 UTC
[1/6] cassandra git commit: Remove offheap_buffer as option for
memtable_allocation_type in cassandra.yaml
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 56d3f9324 -> 873660cf5
refs/heads/cassandra-3.11 760d6c33d -> b26db7a37
refs/heads/trunk 4bb5ada53 -> ced54f87b
Remove offheap_buffer as option for memtable_allocation_type in cassandra.yaml
patch by Brad Vernon; reviewed by Robert Stupp for CASSANDRA-13179
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/873660cf
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/873660cf
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/873660cf
Branch: refs/heads/cassandra-3.0
Commit: 873660cf58cabb3942dfd4dc9c270d27b90a54ce
Parents: 56d3f93
Author: Brad Vernon <br...@datastax.com>
Authored: Wed Mar 1 11:05:33 2017 +0100
Committer: Robert Stupp <sn...@snazy.de>
Committed: Wed Mar 1 11:05:33 2017 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
conf/cassandra.yaml | 6 +++++-
2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/873660cf/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index a63bd12..2289334 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.0.12
+ * Update c.yaml doc for offheap memtables (CASSANDRA-13179)
* Faster StreamingHistogram (CASSANDRA-13038)
* Legacy deserializer can create unexpected boundary range tombstones (CASSANDRA-13237)
* Remove unnecessary assertion from AntiCompactionTest (CASSANDRA-13070)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/873660cf/conf/cassandra.yaml
----------------------------------------------------------------------
diff --git a/conf/cassandra.yaml b/conf/cassandra.yaml
index 790dfd7..61d3844 100644
--- a/conf/cassandra.yaml
+++ b/conf/cassandra.yaml
@@ -397,7 +397,11 @@ concurrent_materialized_view_writes: 32
# Specify the way Cassandra allocates and manages memtable memory.
# Options are:
# heap_buffers: on heap nio buffers
-# offheap_buffers: off heap (direct) nio buffers
+#
+# Note: offheap_buffers are not supported in Cassandra 3.0 - 3.3.
+# They have been re-introduced in Cassandra 3.4. For details see
+# https://issues.apache.org/jira/browse/CASSANDRA-9472 and
+# https://issues.apache.org/jira/browse/CASSANDRA-11039
memtable_allocation_type: heap_buffers
# Total space to use for commit logs on disk.
[3/6] cassandra git commit: Remove offheap_buffer as option for
memtable_allocation_type in cassandra.yaml
Posted by sn...@apache.org.
Remove offheap_buffer as option for memtable_allocation_type in cassandra.yaml
patch by Brad Vernon; reviewed by Robert Stupp for CASSANDRA-13179
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/873660cf
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/873660cf
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/873660cf
Branch: refs/heads/trunk
Commit: 873660cf58cabb3942dfd4dc9c270d27b90a54ce
Parents: 56d3f93
Author: Brad Vernon <br...@datastax.com>
Authored: Wed Mar 1 11:05:33 2017 +0100
Committer: Robert Stupp <sn...@snazy.de>
Committed: Wed Mar 1 11:05:33 2017 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
conf/cassandra.yaml | 6 +++++-
2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/873660cf/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index a63bd12..2289334 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.0.12
+ * Update c.yaml doc for offheap memtables (CASSANDRA-13179)
* Faster StreamingHistogram (CASSANDRA-13038)
* Legacy deserializer can create unexpected boundary range tombstones (CASSANDRA-13237)
* Remove unnecessary assertion from AntiCompactionTest (CASSANDRA-13070)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/873660cf/conf/cassandra.yaml
----------------------------------------------------------------------
diff --git a/conf/cassandra.yaml b/conf/cassandra.yaml
index 790dfd7..61d3844 100644
--- a/conf/cassandra.yaml
+++ b/conf/cassandra.yaml
@@ -397,7 +397,11 @@ concurrent_materialized_view_writes: 32
# Specify the way Cassandra allocates and manages memtable memory.
# Options are:
# heap_buffers: on heap nio buffers
-# offheap_buffers: off heap (direct) nio buffers
+#
+# Note: offheap_buffers are not supported in Cassandra 3.0 - 3.3.
+# They have been re-introduced in Cassandra 3.4. For details see
+# https://issues.apache.org/jira/browse/CASSANDRA-9472 and
+# https://issues.apache.org/jira/browse/CASSANDRA-11039
memtable_allocation_type: heap_buffers
# Total space to use for commit logs on disk.
[2/6] cassandra git commit: Remove offheap_buffer as option for
memtable_allocation_type in cassandra.yaml
Posted by sn...@apache.org.
Remove offheap_buffer as option for memtable_allocation_type in cassandra.yaml
patch by Brad Vernon; reviewed by Robert Stupp for CASSANDRA-13179
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/873660cf
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/873660cf
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/873660cf
Branch: refs/heads/cassandra-3.11
Commit: 873660cf58cabb3942dfd4dc9c270d27b90a54ce
Parents: 56d3f93
Author: Brad Vernon <br...@datastax.com>
Authored: Wed Mar 1 11:05:33 2017 +0100
Committer: Robert Stupp <sn...@snazy.de>
Committed: Wed Mar 1 11:05:33 2017 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
conf/cassandra.yaml | 6 +++++-
2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/873660cf/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index a63bd12..2289334 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.0.12
+ * Update c.yaml doc for offheap memtables (CASSANDRA-13179)
* Faster StreamingHistogram (CASSANDRA-13038)
* Legacy deserializer can create unexpected boundary range tombstones (CASSANDRA-13237)
* Remove unnecessary assertion from AntiCompactionTest (CASSANDRA-13070)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/873660cf/conf/cassandra.yaml
----------------------------------------------------------------------
diff --git a/conf/cassandra.yaml b/conf/cassandra.yaml
index 790dfd7..61d3844 100644
--- a/conf/cassandra.yaml
+++ b/conf/cassandra.yaml
@@ -397,7 +397,11 @@ concurrent_materialized_view_writes: 32
# Specify the way Cassandra allocates and manages memtable memory.
# Options are:
# heap_buffers: on heap nio buffers
-# offheap_buffers: off heap (direct) nio buffers
+#
+# Note: offheap_buffers are not supported in Cassandra 3.0 - 3.3.
+# They have been re-introduced in Cassandra 3.4. For details see
+# https://issues.apache.org/jira/browse/CASSANDRA-9472 and
+# https://issues.apache.org/jira/browse/CASSANDRA-11039
memtable_allocation_type: heap_buffers
# Total space to use for commit logs on disk.
[5/6] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.11
Posted by sn...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b26db7a3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b26db7a3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b26db7a3
Branch: refs/heads/cassandra-3.11
Commit: b26db7a3778c32d5e90a54845878772fd74ba9ab
Parents: 760d6c3 873660c
Author: Robert Stupp <sn...@snazy.de>
Authored: Wed Mar 1 11:06:01 2017 +0100
Committer: Robert Stupp <sn...@snazy.de>
Committed: Wed Mar 1 11:06:01 2017 +0100
----------------------------------------------------------------------
----------------------------------------------------------------------
[6/6] cassandra git commit: Merge branch 'cassandra-3.11' into trunk
Posted by sn...@apache.org.
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/ced54f87
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ced54f87
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ced54f87
Branch: refs/heads/trunk
Commit: ced54f87b5427bf662ea08f325d1c00fb8b1c273
Parents: 4bb5ada b26db7a
Author: Robert Stupp <sn...@snazy.de>
Authored: Wed Mar 1 11:06:09 2017 +0100
Committer: Robert Stupp <sn...@snazy.de>
Committed: Wed Mar 1 11:06:09 2017 +0100
----------------------------------------------------------------------
----------------------------------------------------------------------
[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.11
Posted by sn...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b26db7a3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b26db7a3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b26db7a3
Branch: refs/heads/trunk
Commit: b26db7a3778c32d5e90a54845878772fd74ba9ab
Parents: 760d6c3 873660c
Author: Robert Stupp <sn...@snazy.de>
Authored: Wed Mar 1 11:06:01 2017 +0100
Committer: Robert Stupp <sn...@snazy.de>
Committed: Wed Mar 1 11:06:01 2017 +0100
----------------------------------------------------------------------
----------------------------------------------------------------------