You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ty...@apache.org on 2016/08/10 16:13:32 UTC
[1/4] cassandra git commit: Always use RANGE_SLICE verb for 3.x
messages
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.9 8458e4e30 -> c3e636c52
Always use RANGE_SLICE verb for 3.x messages
Patch by Tyler Hobbs; reviewed by Benjamin Lerer for CASSANDRA-12249
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/465def8e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/465def8e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/465def8e
Branch: refs/heads/cassandra-3.9
Commit: 465def8e295b453dc22430dc4bb7039f6921151e
Parents: 62ef861
Author: Tyler Hobbs <ty...@gmail.com>
Authored: Wed Aug 10 11:09:38 2016 -0500
Committer: Tyler Hobbs <ty...@gmail.com>
Committed: Wed Aug 10 11:09:38 2016 -0500
----------------------------------------------------------------------
CHANGES.txt | 2 ++
src/java/org/apache/cassandra/net/MessageOut.java | 2 +-
src/java/org/apache/cassandra/net/MessagingService.java | 10 ++++++++++
3 files changed, 13 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/465def8e/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index f613c5f..86746ad 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,6 @@
3.0.9
+ * Fix potential bad messaging service message for paged range reads
+ within mixed-version 3.x clusters (CASSANDRA-12249)
* Change commitlog and sstables to track dirty and clean intervals (CASSANDRA-11828)
* NullPointerException during compaction on table with static columns (CASSANDRA-12336)
* Fixed ConcurrentModificationException when reading metrics in GraphiteReporter (CASSANDRA-11823)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/465def8e/src/java/org/apache/cassandra/net/MessageOut.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/net/MessageOut.java b/src/java/org/apache/cassandra/net/MessageOut.java
index a524e7a..ce190cb 100644
--- a/src/java/org/apache/cassandra/net/MessageOut.java
+++ b/src/java/org/apache/cassandra/net/MessageOut.java
@@ -109,7 +109,7 @@ public class MessageOut<T>
{
CompactEndpointSerializationHelper.serialize(from, out);
- out.writeInt(verb.ordinal());
+ out.writeInt(MessagingService.Verb.convertForMessagingServiceVersion(verb, version).ordinal());
out.writeInt(parameters.size());
for (Map.Entry<String, byte[]> entry : parameters.entrySet())
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/465def8e/src/java/org/apache/cassandra/net/MessagingService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/net/MessagingService.java b/src/java/org/apache/cassandra/net/MessagingService.java
index d01419f..45cfb8a 100644
--- a/src/java/org/apache/cassandra/net/MessagingService.java
+++ b/src/java/org/apache/cassandra/net/MessagingService.java
@@ -148,6 +148,16 @@ public final class MessagingService implements MessagingServiceMBean
UNUSED_4,
UNUSED_5,
;
+
+ // This is to support a "late" choice of the verb based on the messaging service version.
+ // See CASSANDRA-12249 for more details.
+ public static Verb convertForMessagingServiceVersion(Verb verb, int version)
+ {
+ if (verb == PAGED_RANGE && version >= VERSION_30)
+ return RANGE_SLICE;
+
+ return verb;
+ }
}
public static final EnumMap<MessagingService.Verb, Stage> verbStages = new EnumMap<MessagingService.Verb, Stage>(MessagingService.Verb.class)
[3/4] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.9
Posted by ty...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.9
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2d769f0c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2d769f0c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2d769f0c
Branch: refs/heads/cassandra-3.9
Commit: 2d769f0c5721be06a7401c69f45cfddf4d8fc736
Parents: 8458e4e 465def8
Author: Tyler Hobbs <ty...@gmail.com>
Authored: Wed Aug 10 11:12:18 2016 -0500
Committer: Tyler Hobbs <ty...@gmail.com>
Committed: Wed Aug 10 11:12:18 2016 -0500
----------------------------------------------------------------------
CHANGES.txt | 2 ++
src/java/org/apache/cassandra/net/MessageOut.java | 2 +-
src/java/org/apache/cassandra/net/MessagingService.java | 10 ++++++++++
3 files changed, 13 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2d769f0c/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 8fbd774,86746ad..9f7631d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -22,48 -17,6 +22,50 @@@ Merged from 3.0
to connect with too low of a protocol version (CASSANDRA-11464)
* NullPointerExpception when reading/compacting table (CASSANDRA-11988)
* Fix problem with undeleteable rows on upgrade to new sstable format (CASSANDRA-12144)
+Merged from 2.2:
+ * Fix hanging stream session (CASSANDRA-10992)
+ * Fix INSERT JSON, fromJson() support of smallint, tinyint types (CASSANDRA-12371)
+ * Release sstables of failed stream sessions only when outgoing transfers are finished (CASSANDRA-11345)
+ * Wait for tracing events before returning response and query at same consistency level client side (CASSANDRA-11465)
+ * cqlsh copyutil should get host metadata by connected address (CASSANDRA-11979)
+ * Fixed cqlshlib.test.remove_test_db (CASSANDRA-12214)
+Merged from 2.1:
+ * cannot use cql since upgrading python to 2.7.11+ (CASSANDRA-11850)
+ * Allow STCS-in-L0 compactions to reduce scope with LCS (CASSANDRA-12040)
+
+
+3.8
+ * RTE from new CDC column breaks in flight queries (CASSANDRA-12236)
+ * Fix hdr logging for single operation workloads (CASSANDRA-12145)
+ * Fix SASI PREFIX search in CONTAINS mode with partial terms (CASSANDRA-12073)
+ * Increase size of flushExecutor thread pool (CASSANDRA-12071)
+ * Partial revert of CASSANDRA-11971, cannot recycle buffer in SP.sendMessagesToNonlocalDC (CASSANDRA-11950)
+ * Upgrade netty to 4.0.39 (CASSANDRA-12032, CASSANDRA-12034)
+ * Improve details in compaction log message (CASSANDRA-12080)
+ * Allow unset values in CQLSSTableWriter (CASSANDRA-11911)
+ * Chunk cache to request compressor-compatible buffers if pool space is exhausted (CASSANDRA-11993)
+ * Remove DatabaseDescriptor dependencies from SequentialWriter (CASSANDRA-11579)
+ * Move skip_stop_words filter before stemming (CASSANDRA-12078)
+ * Support seek() in EncryptedFileSegmentInputStream (CASSANDRA-11957)
+ * SSTable tools mishandling LocalPartitioner (CASSANDRA-12002)
+ * When SEPWorker assigned work, set thread name to match pool (CASSANDRA-11966)
+ * Add cross-DC latency metrics (CASSANDRA-11596)
+ * Allow terms in selection clause (CASSANDRA-10783)
+ * Add bind variables to trace (CASSANDRA-11719)
+ * Switch counter shards' clock to timestamps (CASSANDRA-9811)
+ * Introduce HdrHistogram and response/service/wait separation to stress tool (CASSANDRA-11853)
+ * entry-weighers in QueryProcessor should respect partitionKeyBindIndexes field (CASSANDRA-11718)
+ * Support older ant versions (CASSANDRA-11807)
+ * Estimate compressed on disk size when deciding if sstable size limit reached (CASSANDRA-11623)
+ * cassandra-stress profiles should support case sensitive schemas (CASSANDRA-11546)
+ * Remove DatabaseDescriptor dependency from FileUtils (CASSANDRA-11578)
+ * Faster streaming (CASSANDRA-9766)
+ * Add prepared query parameter to trace for "Execute CQL3 prepared query" session (CASSANDRA-11425)
+ * Add repaired percentage metric (CASSANDRA-11503)
+ * Add Change-Data-Capture (CASSANDRA-8844)
+Merged from 3.0:
++ * Fix potential bad messaging service message for paged range reads
++ within mixed-version 3.x clusters (CASSANDRA-12249)
* Fix paging logic for deleted partitions with static columns (CASSANDRA-12107)
* Wait until the message is being send to decide which serializer must be used (CASSANDRA-11393)
* Fix migration of static thrift column names with non-text comparators (CASSANDRA-12147)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2d769f0c/src/java/org/apache/cassandra/net/MessageOut.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2d769f0c/src/java/org/apache/cassandra/net/MessagingService.java
----------------------------------------------------------------------
[4/4] cassandra git commit: Merge branch 'cassandra-3.8' into
cassandra-3.9
Posted by ty...@apache.org.
Merge branch 'cassandra-3.8' into cassandra-3.9
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c3e636c5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c3e636c5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c3e636c5
Branch: refs/heads/cassandra-3.9
Commit: c3e636c528a09371255d460ad6a91eb0c1d47875
Parents: 2d769f0 b188e08
Author: Tyler Hobbs <ty...@gmail.com>
Authored: Wed Aug 10 11:12:33 2016 -0500
Committer: Tyler Hobbs <ty...@gmail.com>
Committed: Wed Aug 10 11:12:33 2016 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[2/4] cassandra git commit: Always use RANGE_SLICE verb for 3.x
messages
Posted by ty...@apache.org.
Always use RANGE_SLICE verb for 3.x messages
Patch by Tyler Hobbs; reviewed by Benjamin Lerer for CASSANDRA-12249
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b188e082
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b188e082
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b188e082
Branch: refs/heads/cassandra-3.9
Commit: b188e0826e6b9a14d137b9497bb63dec875f6c83
Parents: 18c357b
Author: Tyler Hobbs <ty...@gmail.com>
Authored: Wed Aug 10 11:09:38 2016 -0500
Committer: Tyler Hobbs <ty...@gmail.com>
Committed: Wed Aug 10 11:11:30 2016 -0500
----------------------------------------------------------------------
CHANGES.txt | 2 ++
src/java/org/apache/cassandra/net/MessageOut.java | 2 +-
src/java/org/apache/cassandra/net/MessagingService.java | 10 ++++++++++
3 files changed, 13 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b188e082/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 388a290..10c5d40 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -28,6 +28,8 @@
* Add repaired percentage metric (CASSANDRA-11503)
* Add Change-Data-Capture (CASSANDRA-8844)
Merged from 3.0:
+ * Fix potential bad messaging service message for paged range reads
+ within mixed-version 3.x clusters (CASSANDRA-12249)
* Fix paging logic for deleted partitions with static columns (CASSANDRA-12107)
* Wait until the message is being send to decide which serializer must be used (CASSANDRA-11393)
* Fix migration of static thrift column names with non-text comparators (CASSANDRA-12147)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b188e082/src/java/org/apache/cassandra/net/MessageOut.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/net/MessageOut.java b/src/java/org/apache/cassandra/net/MessageOut.java
index bc5c41b..34694a6 100644
--- a/src/java/org/apache/cassandra/net/MessageOut.java
+++ b/src/java/org/apache/cassandra/net/MessageOut.java
@@ -104,7 +104,7 @@ public class MessageOut<T>
{
CompactEndpointSerializationHelper.serialize(from, out);
- out.writeInt(verb.ordinal());
+ out.writeInt(MessagingService.Verb.convertForMessagingServiceVersion(verb, version).ordinal());
out.writeInt(parameters.size());
for (Map.Entry<String, byte[]> entry : parameters.entrySet())
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b188e082/src/java/org/apache/cassandra/net/MessagingService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/net/MessagingService.java b/src/java/org/apache/cassandra/net/MessagingService.java
index 220fc66..3302357 100644
--- a/src/java/org/apache/cassandra/net/MessagingService.java
+++ b/src/java/org/apache/cassandra/net/MessagingService.java
@@ -151,6 +151,16 @@ public final class MessagingService implements MessagingServiceMBean
UNUSED_4,
UNUSED_5,
;
+
+ // This is to support a "late" choice of the verb based on the messaging service version.
+ // See CASSANDRA-12249 for more details.
+ public static Verb convertForMessagingServiceVersion(Verb verb, int version)
+ {
+ if (verb == PAGED_RANGE && version >= VERSION_30)
+ return RANGE_SLICE;
+
+ return verb;
+ }
}
public static final EnumMap<MessagingService.Verb, Stage> verbStages = new EnumMap<MessagingService.Verb, Stage>(MessagingService.Verb.class)