Updated Branches: refs/heads/cassandra-1.2 c688125ba -> 7cb8cf1df
Don't announce migrations to pre-1.2 nodes patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for CASSANDRA-5334 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7cb8cf1d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7cb8cf1d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7cb8cf1d Branch: refs/heads/cassandra-1.2 Commit: 7cb8cf1df57a025d148bf1e5d84530e7c360fd24 Parents: c688125 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Thu Mar 14 00:02:01 2013 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Thu Mar 14 00:02:01 2013 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/service/MigrationManager.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7cb8cf1d/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 6472974..a34b73e 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -20,6 +20,7 @@ * Fix repair -pr for vnodes (CASSANDRA-5329) * Relax CL for auth queries for non-default users (CASSANDRA-5310) * Fix AssertionError during repair (CASSANDRA-5245) + * Don't announce migrations to pre-1.2 nodes (CASSANDRA-5334) Merged from 1.1: * add tmp flag to Descriptor hashcode (CASSANDRA-4021) * fix logging of "Found table data in data directories" when only system tables http://git-wip-us.apache.org/repos/asf/cassandra/blob/7cb8cf1d/src/java/org/apache/cassandra/service/MigrationManager.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/MigrationManager.java b/src/java/org/apache/cassandra/service/MigrationManager.java index ab1d6b2..7b9d64b 100644 --- a/src/java/org/apache/cassandra/service/MigrationManager.java +++ b/src/java/org/apache/cassandra/service/MigrationManager.java @@ -305,8 +305,8 @@ public class MigrationManager implements IEndpointStateChangeSubscriber if (endpoint.equals(FBUtilities.getBroadcastAddress())) continue; // we've delt with localhost already - // don't send migrations to the nodes with the versions older than < 1.1 - if (MessagingService.instance().getVersion(endpoint) < MessagingService.VERSION_11) + // don't send migrations to the nodes with the versions older than < 1.2 + if (MessagingService.instance().getVersion(endpoint) < MessagingService.VERSION_12) continue; pushSchemaMutation(endpoint, schema);
