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 47355107D0 for ; Fri, 7 Feb 2014 14:38:08 +0000 (UTC) Received: (qmail 75588 invoked by uid 500); 7 Feb 2014 14:38:06 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 75526 invoked by uid 500); 7 Feb 2014 14:38:03 -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 75398 invoked by uid 99); 7 Feb 2014 14:38:00 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 07 Feb 2014 14:38:00 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id E5ED891EEE9; Fri, 7 Feb 2014 14:37:59 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: brandonwilliams@apache.org To: commits@cassandra.apache.org Date: Fri, 07 Feb 2014 14:38:05 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [7/8] git commit: Fix unwanted schema pull while upgrading nodes from 1.2 to 2.0 Patch by Sergio Bossa, reviewed by brandonwilliams for CASSANDRA-6678 Fix unwanted schema pull while upgrading nodes from 1.2 to 2.0 Patch by Sergio Bossa, reviewed by brandonwilliams for CASSANDRA-6678 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9e0700c0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9e0700c0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9e0700c0 Branch: refs/heads/cassandra-2.0 Commit: 9e0700c07e643c3eaf0a7687aab92f02a32d1899 Parents: fe5de33 Author: Brandon Williams Authored: Fri Feb 7 08:35:20 2014 -0600 Committer: Brandon Williams Committed: Fri Feb 7 08:35:20 2014 -0600 ---------------------------------------------------------------------- src/java/org/apache/cassandra/service/MigrationManager.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9e0700c0/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 b463116..fdcefe4 100644 --- a/src/java/org/apache/cassandra/service/MigrationManager.java +++ b/src/java/org/apache/cassandra/service/MigrationManager.java @@ -137,8 +137,9 @@ public class MigrationManager * Don't request schema from nodes with a higher major (may have incompatible schema) * Don't request schema from fat clients */ - return MessagingService.instance().getVersion(endpoint) <= MessagingService.current_version - && !Gossiper.instance.isFatClient(endpoint); + return MessagingService.instance().knowsVersion(endpoint) + && MessagingService.instance().getVersion(endpoint) <= MessagingService.current_version + && !Gossiper.instance.isFatClient(endpoint); } public static boolean isReadyForBootstrap()