You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2014/10/17 22:14:35 UTC
[1/7] git commit: Update versions for 2.0.11
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 b84d06f4c -> 42f859042
refs/heads/trunk fea7d9a03 -> b6b08f281
Update versions for 2.0.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3c8a2a76
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3c8a2a76
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3c8a2a76
Branch: refs/heads/trunk
Commit: 3c8a2a7660f156c41260019965d9e345d934eb01
Parents: 29a8b88
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Fri Oct 17 13:02:29 2014 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Fri Oct 17 13:02:29 2014 +0200
----------------------------------------------------------------------
NEWS.txt | 8 ++++++++
build.xml | 2 +-
debian/changelog | 6 ++++++
3 files changed, 15 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3c8a2a76/NEWS.txt
----------------------------------------------------------------------
diff --git a/NEWS.txt b/NEWS.txt
index 102a87b..6f6b795 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -15,14 +15,22 @@ using the provided 'sstableupgrade' tool.
2.0.11
======
+
+Upgrading
+---------
+ - Nothing specific to this release, but refer to previous entries if you
+ are upgrading from a previous version.
+
New features
------------
- DateTieredCompactionStrategy added, optimized for time series data and groups
data that is written closely in time (CASSANDRA-6602 for details). Consider
this experimental for now.
+
2.0.10
======
+
New features
------------
- CqlPaginRecordReader and CqlPagingInputFormat have both been removed.
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3c8a2a76/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 829c873..8c23407 100644
--- a/build.xml
+++ b/build.xml
@@ -25,7 +25,7 @@
<property name="debuglevel" value="source,lines,vars"/>
<!-- default version and SCM information -->
- <property name="base.version" value="2.0.10"/>
+ <property name="base.version" value="2.0.11"/>
<property name="scm.connection" value="scm:git://git.apache.org/cassandra.git"/>
<property name="scm.developerConnection" value="scm:git://git.apache.org/cassandra.git"/>
<property name="scm.url" value="http://git-wip-us.apache.org/repos/asf?p=cassandra.git;a=tree"/>
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3c8a2a76/debian/changelog
----------------------------------------------------------------------
diff --git a/debian/changelog b/debian/changelog
index e0b1eae..39d9520 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cassandra (2.0.11) unstable; urgency=medium
+
+ * New release
+
+ -- Sylvain Lebresne <sl...@apache.org> Fri, 17 Oct 2014 13:01:02 +0200
+
cassandra (2.0.10) unstable; urgency=medium
* New release
[5/7] git commit: Don't do generation safety check when the local gen
is zero
Posted by br...@apache.org.
Don't do generation safety check when the local gen is zero
Patch by brandonwilliams, reviewed by jasobrown for CASSANDRA-8113
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/42f85904
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/42f85904
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/42f85904
Branch: refs/heads/trunk
Commit: 42f85904221aeaf0181f75af2fa5d469b8cbcee7
Parents: b84d06f
Author: Brandon Williams <br...@apache.org>
Authored: Fri Oct 17 15:13:26 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Oct 17 15:13:26 2014 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/gms/Gossiper.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/42f85904/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/gms/Gossiper.java b/src/java/org/apache/cassandra/gms/Gossiper.java
index 5f0e576..3fdee88 100644
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@ -987,7 +987,7 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean
if (logger.isTraceEnabled())
logger.trace(ep + "local generation " + localGeneration + ", remote generation " + remoteGeneration);
- if (remoteGeneration > localGeneration + MAX_GENERATION_DIFFERENCE)
+ if (localGeneration != 0 && remoteGeneration > localGeneration + MAX_GENERATION_DIFFERENCE)
{
// assume some peer has corrupted memory and is broadcasting an unbelievable generation about another peer (or itself)
logger.warn("received an invalid gossip generation for peer {}; local generation = {}, received generation = {}", ep, localGeneration, remoteGeneration);
[7/7] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by br...@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/b6b08f28
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b6b08f28
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b6b08f28
Branch: refs/heads/trunk
Commit: b6b08f281bc763a7d7a16d950593c7f8466d9328
Parents: fea7d9a 42f8590
Author: Brandon Williams <br...@apache.org>
Authored: Fri Oct 17 15:14:21 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Oct 17 15:14:21 2014 -0500
----------------------------------------------------------------------
NEWS.txt | 13 +++++++++++++
debian/changelog | 6 ++++++
src/java/org/apache/cassandra/gms/Gossiper.java | 2 +-
3 files changed, 20 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b6b08f28/NEWS.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b6b08f28/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/gms/Gossiper.java
index ebe05d2,3fdee88..e698adf
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@@ -993,9 -985,9 +993,9 @@@ public class Gossiper implements IFailu
int localGeneration = localEpStatePtr.getHeartBeatState().getGeneration();
int remoteGeneration = remoteState.getHeartBeatState().getGeneration();
if (logger.isTraceEnabled())
- logger.trace(ep + "local generation " + localGeneration + ", remote generation " + remoteGeneration);
+ logger.trace("{} local generation {}, remote generation {}", ep, localGeneration, remoteGeneration);
- if (remoteGeneration > localGeneration + MAX_GENERATION_DIFFERENCE)
+ if (localGeneration != 0 && remoteGeneration > localGeneration + MAX_GENERATION_DIFFERENCE)
{
// assume some peer has corrupted memory and is broadcasting an unbelievable generation about another peer (or itself)
logger.warn("received an invalid gossip generation for peer {}; local generation = {}, received generation = {}", ep, localGeneration, remoteGeneration);
[3/7] git commit: Update news/version for 2.1.1
Posted by br...@apache.org.
Update news/version for 2.1.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8fca88e3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8fca88e3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8fca88e3
Branch: refs/heads/trunk
Commit: 8fca88e3068f7c1ec8aa36506643d2a044dd59e3
Parents: 049ace4
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Fri Oct 17 13:45:08 2014 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Fri Oct 17 13:45:08 2014 +0200
----------------------------------------------------------------------
NEWS.txt | 5 +++++
debian/changelog | 6 ++++++
2 files changed, 11 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8fca88e3/NEWS.txt
----------------------------------------------------------------------
diff --git a/NEWS.txt b/NEWS.txt
index 50b9c7e..ecdb47e 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -16,6 +16,11 @@ using the provided 'sstableupgrade' tool.
2.1.1
=====
+Upgrading
+---------
+ - Nothing specific to this release, but please see 2.1 if you are upgrading
+ from a previous version.
+
New features
------------
- Netty support for epoll on linux is now enabled. If for some
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8fca88e3/debian/changelog
----------------------------------------------------------------------
diff --git a/debian/changelog b/debian/changelog
index f2ecceb..4e240eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cassandra (2.1.1) unstable; urgency=medium
+
+ * New release
+
+ -- Sylvain Lebresne <sl...@apache.org> Fri, 17 Oct 2014 13:43:46 +0200
+
cassandra (2.1.0) unstable; urgency=medium
* New release
[4/7] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by br...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
build.xml
debian/changelog
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b84d06f4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b84d06f4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b84d06f4
Branch: refs/heads/trunk
Commit: b84d06f4c77032855e5b9e57c6132a5d2600a933
Parents: 8fca88e 3c8a2a7
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Fri Oct 17 13:45:47 2014 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Fri Oct 17 13:45:47 2014 +0200
----------------------------------------------------------------------
NEWS.txt | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b84d06f4/NEWS.txt
----------------------------------------------------------------------
diff --cc NEWS.txt
index ecdb47e,6f6b795..d3d7b76
--- a/NEWS.txt
+++ b/NEWS.txt
@@@ -13,89 -13,14 +13,95 @@@ restore snapshots created with the prev
'sstableloader' tool. You can upgrade the file format of your snapshots
using the provided 'sstableupgrade' tool.
+2.1.1
+=====
+
+Upgrading
+---------
+ - Nothing specific to this release, but please see 2.1 if you are upgrading
+ from a previous version.
+
+New features
+------------
+ - Netty support for epoll on linux is now enabled. If for some
+ reason you want to disable it pass, the following system property
+ -Dcassandra.native.epoll.enabled=false
+
+2.1
+===
+
+New features
+------------
+ - Default data and log locations have changed. If not set in
+ cassandra.yaml, the data file directory, commitlog directory,
+ and saved caches directory will default to $CASSANDRA_HOME/data/data,
+ $CASSANDRA_HOME/data/commitlog, and $CASSANDRA_HOME/data/saved_caches,
+ respectively. The log directory now defaults to $CASSANDRA_HOME/logs.
+ If not set, $CASSANDRA_HOME, defaults to the top-level directory of
+ the installation.
+ Note that this should only affect source checkouts and tarballs.
+ Deb and RPM packages will continue to use /var/lib/cassandra and
+ /var/log/cassandra in cassandra.yaml.
+ - SSTable data directory name is slightly changed. Each directory will
+ have hex string appended after CF name, e.g.
+ ks/cf-5be396077b811e3a3ab9dc4b9ac088d/
+ This hex string part represents unique ColumnFamily ID.
+ Note that existing directories are used as is, so only newly created
+ directories after upgrade have new directory name format.
+ - Saved key cache files also have ColumnFamily ID in their file name.
+ - It is now possible to do incremental repairs, sstables that have been
+ repaired are marked with a timestamp and not included in the next
+ repair session. Use nodetool repair -par -inc to use this feature.
+ A tool to manually mark/unmark sstables as repaired is available in
+ tools/bin/sstablerepairedset. This is particularly important when
+ using LCS, or any data not repaired in your first incremental repair
+ will be put back in L0.
+ - Bootstrapping now ensures that range movements are consistent,
+ meaning the data for the new node is taken from the node that is no
+ longer a responsible for that range of keys.
+ If you want the old behavior (due to a lost node perhaps)
+ you can set the following property (-Dcassandra.consistent.rangemovement=false)
+ - It is now possible to use quoted identifiers in triggers' names.
+ WARNING: if you previously used triggers with capital letters in their
+ names, then you must quote them from now on.
+ - Improved stress tool (http://goo.gl/OTNqiQ)
+ - New incremental repair option (http://goo.gl/MjohJp, http://goo.gl/f8jSme)
+ - Incremental replacement of compacted SSTables (http://goo.gl/JfDBGW)
+ - The row cache can now cache only the head of partitions (http://goo.gl/6TJPH6)
+ - Off-heap memtables (http://goo.gl/YT7znJ)
+ - CQL improvements and additions: User-defined types, tuple types, 2ndary
+ indexing of collections, ... (http://goo.gl/kQl7GW)
+
+Upgrading
+---------
+ - Rolling upgrades from anything pre-2.0.7 is not supported. Furthermore
+ pre-2.0 sstables are not supported. This means that before upgrading
+ a node on 2.1, this node must be started on 2.0 and
+ 'nodetool upgdradesstables' must be run (and this even in the case
+ of not-rolling upgrades).
+ - For size-tiered compaction users, Cassandra now defaults to ignoring
+ the coldest 5% of sstables. This can be customized with the
+ cold_reads_to_omit compaction option; 0.0 omits nothing (the old
+ behavior) and 1.0 omits everything.
+ - Multithreaded compaction has been removed.
+ - Counters implementation has been changed, replaced by a safer one with
+ less caveats, but different performance characteristics. You might have
+ to change your data model to accomodate the new implementation.
+ (See https://issues.apache.org/jira/browse/CASSANDRA-6504 and the
+ blog post at http://goo.gl/qj8iQl for details).
+ - (per-table) index_interval parameter has been replaced with
+ min_index_interval and max_index_interval paratemeters. index_interval
+ has been deprecated.
+ - support for supercolumns has been removed from json2sstable
+
2.0.11
======
+
+ Upgrading
+ ---------
+ - Nothing specific to this release, but refer to previous entries if you
+ are upgrading from a previous version.
+
New features
------------
- DateTieredCompactionStrategy added, optimized for time series data and groups
[2/7] git commit: Fix DynamicCompositeTypeTest
Posted by br...@apache.org.
Fix DynamicCompositeTypeTest
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/049ace4c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/049ace4c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/049ace4c
Branch: refs/heads/trunk
Commit: 049ace4c1847d39af5724538476971cbccce3ea9
Parents: f4037ed
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Fri Oct 17 13:08:09 2014 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Fri Oct 17 13:08:09 2014 +0200
----------------------------------------------------------------------
.../cassandra/db/marshal/DynamicCompositeTypeTest.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/049ace4c/test/unit/org/apache/cassandra/db/marshal/DynamicCompositeTypeTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/marshal/DynamicCompositeTypeTest.java b/test/unit/org/apache/cassandra/db/marshal/DynamicCompositeTypeTest.java
index e248eae..e9c47a9 100644
--- a/test/unit/org/apache/cassandra/db/marshal/DynamicCompositeTypeTest.java
+++ b/test/unit/org/apache/cassandra/db/marshal/DynamicCompositeTypeTest.java
@@ -219,11 +219,11 @@ public class DynamicCompositeTypeTest extends SchemaLoader
Iterator<Cell> iter = cf.getSortedColumns().iterator();
- assert iter.next().name().equals(cname5);
- assert iter.next().name().equals(cname4);
- assert iter.next().name().equals(cname1); // null UUID < reversed value
- assert iter.next().name().equals(cname3);
- assert iter.next().name().equals(cname2);
+ assert iter.next().name().toByteBuffer().equals(cname5);
+ assert iter.next().name().toByteBuffer().equals(cname4);
+ assert iter.next().name().toByteBuffer().equals(cname1); // null UUID < reversed value
+ assert iter.next().name().toByteBuffer().equals(cname3);
+ assert iter.next().name().toByteBuffer().equals(cname2);
}
@Test
[6/7] git commit: Don't do generation safety check when the local gen
is zero
Posted by br...@apache.org.
Don't do generation safety check when the local gen is zero
Patch by brandonwilliams, reviewed by jasobrown for CASSANDRA-8113
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/42f85904
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/42f85904
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/42f85904
Branch: refs/heads/cassandra-2.1
Commit: 42f85904221aeaf0181f75af2fa5d469b8cbcee7
Parents: b84d06f
Author: Brandon Williams <br...@apache.org>
Authored: Fri Oct 17 15:13:26 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Oct 17 15:13:26 2014 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/gms/Gossiper.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/42f85904/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/gms/Gossiper.java b/src/java/org/apache/cassandra/gms/Gossiper.java
index 5f0e576..3fdee88 100644
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@ -987,7 +987,7 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean
if (logger.isTraceEnabled())
logger.trace(ep + "local generation " + localGeneration + ", remote generation " + remoteGeneration);
- if (remoteGeneration > localGeneration + MAX_GENERATION_DIFFERENCE)
+ if (localGeneration != 0 && remoteGeneration > localGeneration + MAX_GENERATION_DIFFERENCE)
{
// assume some peer has corrupted memory and is broadcasting an unbelievable generation about another peer (or itself)
logger.warn("received an invalid gossip generation for peer {}; local generation = {}, received generation = {}", ep, localGeneration, remoteGeneration);