Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 3BF64DD28 for ; Wed, 13 Mar 2013 22:56:38 +0000 (UTC) Received: (qmail 87350 invoked by uid 500); 13 Mar 2013 22:56:38 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 87324 invoked by uid 500); 13 Mar 2013 22:56:38 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 87314 invoked by uid 99); 13 Mar 2013 22:56:38 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 13 Mar 2013 22:56:38 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id ADA5F16432; Wed, 13 Mar 2013 22:56:37 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aleksey@apache.org To: commits@cassandra.apache.org X-Mailer: ASF-Git Admin Mailer Subject: git commit: Don't request migrations from 1.2+ nodes Message-Id: <20130313225637.ADA5F16432@tyr.zones.apache.org> Date: Wed, 13 Mar 2013 22:56:37 +0000 (UTC) Updated Branches: refs/heads/cassandra-1.1 ba06e4128 -> 3346771a0 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/cassandra-1.1 Commit: 3346771a03fa334f2375fc585694bb768bb7b0d8 Parents: ba06e41 Author: Aleksey Yeschenko Authored: Thu Mar 14 01:54:00 2013 +0300 Committer: Aleksey Yeschenko 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;