You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2014/02/19 17:01:28 UTC
[04/12] git commit: Don't attempt cross-dc forwarding
interface/mixed-version cluster with 1.1 patch by Jeremiah Jordan;
reviewed by jbellis for CASSANDRA-6732
Don't attempt cross-dc forwarding interface/mixed-version cluster with 1.1
patch by Jeremiah Jordan; reviewed by jbellis for CASSANDRA-6732
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c92b20b3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c92b20b3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c92b20b3
Branch: refs/heads/trunk
Commit: c92b20b3073f1c5cca3666225db33ea102ba77b5
Parents: e787b7a
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Feb 19 08:32:40 2014 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Feb 19 08:32:40 2014 -0600
----------------------------------------------------------------------
CHANGES.txt | 8 ++++++--
src/java/org/apache/cassandra/service/StorageProxy.java | 2 +-
2 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c92b20b3/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 47fc3a3..ffda82c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,6 @@
1.2.16
+ * Don't attempt cross-dc forwarding in mixed-version cluster with 1.1
+ (CASSANDRA-6732)
* Fix broken streams when replacing with same IP (CASSANDRA-6622)
* Fix upgradesstables NPE for non-CF-based indexes (CASSANDRA-6645)
* Fix partition and range deletes not triggering flush (CASSANDRA-6655)
@@ -6,8 +8,10 @@
* Compact hints after partial replay to clean out tombstones (CASSANDRA-6666)
* Log USING TTL/TIMESTAMP in a counter update warning (CASSANDRA-6649)
* Don't exchange schema between nodes with different versions (CASSANDRA-6695)
- * Use real node messaging versions for schema exchange decisions (CASSANDRA-6700)
- * IN on the last clustering columns + ORDER BY DESC yield no results (CASSANDRA-6701)
+ * Use real node messaging versions for schema exchange decisions
+ (CASSANDRA-6700)
+ * IN on the last clustering columns + ORDER BY DESC yield no results
+ (CASSANDRA-6701)
* Fix SecondaryIndexManager#deleteFromIndexes() (CASSANDRA-6711)
* Fix snapshot repair not snapshotting coordinator itself (CASSANDRA-6713)
* Support negative timestamps for CQL3 dates in query string (CASSANDRA-6718)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c92b20b3/src/java/org/apache/cassandra/service/StorageProxy.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageProxy.java b/src/java/org/apache/cassandra/service/StorageProxy.java
index dbe029b..ca82a1f 100644
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@ -614,7 +614,7 @@ public class StorageProxy implements StorageProxyMBean
InetAddress target = iter.next();
// direct writes to local DC or old Cassandra versions
- if (localDC || MessagingService.instance().getVersion(target) < MessagingService.VERSION_11)
+ if (localDC || MessagingService.instance().getVersion(target) < MessagingService.VERSION_12)
{
// yes, the loop and non-loop code here are the same; this is clunky but we want to avoid
// creating a second iterator since we already have a perfectly good one