Don't request migrations from 1.2+ nodes
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3346771a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3346771a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3346771a Branch: refs/heads/trunk Commit: 3346771a03fa334f2375fc585694bb768bb7b0d8 Parents: ba06e41 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Thu Mar 14 01:54:00 2013 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Thu Mar 14 01:54:00 2013 +0300 ---------------------------------------------------------------------- .../org/apache/cassandra/net/MessagingService.java | 1 + .../apache/cassandra/service/MigrationManager.java | 4 ++++ 2 files changed, 5 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3346771a/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 b605575..bfc97ba 100644 --- a/src/java/org/apache/cassandra/net/MessagingService.java +++ b/src/java/org/apache/cassandra/net/MessagingService.java @@ -70,6 +70,7 @@ public final class MessagingService implements MessagingServiceMBean public static final int VERSION_10 = 3; public static final int VERSION_11 = 4; public static final int VERSION_117 = 5; + public static final int VERSION_12 = 6; public static final int version_ = VERSION_117; http://git-wip-us.apache.org/repos/asf/cassandra/blob/3346771a/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 49e0c93..bb9149f 100644 --- a/src/java/org/apache/cassandra/service/MigrationManager.java +++ b/src/java/org/apache/cassandra/service/MigrationManager.java @@ -110,6 +110,10 @@ public class MigrationManager implements IEndpointStateChangeSubscriber if (Gossiper.instance.getVersion(endpoint) < MessagingService.VERSION_117) return; + // Don't request migrations from nodes with versions that are >= 1.2 + if (Gossiper.instance.getVersion(endpoint) >= MessagingService.VERSION_12) + return; + if (Schema.instance.getVersion().equals(theirVersion)) return;
