You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2014/02/07 15:38:04 UTC
[6/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/trunk
Commit: 9e0700c07e643c3eaf0a7687aab92f02a32d1899
Parents: fe5de33
Author: Brandon Williams <br...@apache.org>
Authored: Fri Feb 7 08:35:20 2014 -0600
Committer: Brandon Williams <br...@apache.org>
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()