From 3c8a2a7660f156c41260019965d9e345d934eb01 Mon Sep 17 00:00:00 2001 From: Sylvain Lebresne Date: Fri, 17 Oct 2014 13:02:29 +0200 Subject: [PATCH 1/4] Update versions for 2.0.11 --- NEWS.txt | 8 ++++++++ build.xml | 2 +- debian/changelog | 6 ++++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/NEWS.txt b/NEWS.txt index 102a87b696..6f6b795458 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. diff --git a/build.xml b/build.xml index 829c873c8a..8c23407f05 100644 --- a/build.xml +++ b/build.xml @@ -25,7 +25,7 @@ - + diff --git a/debian/changelog b/debian/changelog index e0b1eae726..39d9520ff3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +cassandra (2.0.11) unstable; urgency=medium + + * New release + + -- Sylvain Lebresne Fri, 17 Oct 2014 13:01:02 +0200 + cassandra (2.0.10) unstable; urgency=medium * New release From 049ace4c1847d39af5724538476971cbccce3ea9 Mon Sep 17 00:00:00 2001 From: Sylvain Lebresne Date: Fri, 17 Oct 2014 13:08:09 +0200 Subject: [PATCH 2/4] Fix DynamicCompositeTypeTest --- .../cassandra/db/marshal/DynamicCompositeTypeTest.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/unit/org/apache/cassandra/db/marshal/DynamicCompositeTypeTest.java b/test/unit/org/apache/cassandra/db/marshal/DynamicCompositeTypeTest.java index e248eaea6e..e9c47a919a 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 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 From 8fca88e3068f7c1ec8aa36506643d2a044dd59e3 Mon Sep 17 00:00:00 2001 From: Sylvain Lebresne Date: Fri, 17 Oct 2014 13:45:08 +0200 Subject: [PATCH 3/4] Update news/version for 2.1.1 --- NEWS.txt | 5 +++++ debian/changelog | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/NEWS.txt b/NEWS.txt index 50b9c7e091..ecdb47efed 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 diff --git a/debian/changelog b/debian/changelog index f2eccebf48..4e240eb06f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +cassandra (2.1.1) unstable; urgency=medium + + * New release + + -- Sylvain Lebresne Fri, 17 Oct 2014 13:43:46 +0200 + cassandra (2.1.0) unstable; urgency=medium * New release From 42f85904221aeaf0181f75af2fa5d469b8cbcee7 Mon Sep 17 00:00:00 2001 From: Brandon Williams Date: Fri, 17 Oct 2014 15:13:26 -0500 Subject: [PATCH 4/4] Don't do generation safety check when the local gen is zero Patch by brandonwilliams, reviewed by jasobrown for CASSANDRA-8113 --- src/java/org/apache/cassandra/gms/Gossiper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/java/org/apache/cassandra/gms/Gossiper.java b/src/java/org/apache/cassandra/gms/Gossiper.java index 5f0e576827..3fdee88cfc 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);