diff --git a/src/java/org/apache/cassandra/net/MessagingService.java b/src/java/org/apache/cassandra/net/MessagingService.java index b6055759c2..bfc97ba89b 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; diff --git a/src/java/org/apache/cassandra/service/MigrationManager.java b/src/java/org/apache/cassandra/service/MigrationManager.java index 49e0c93c79..bb9149f8ba 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;