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:37:59 UTC
[1/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
Updated Branches:
refs/heads/cassandra-1.2 8b6d87b86 -> 31414fb87
refs/heads/cassandra-2.0 6e0ce7a05 -> 9e0700c07
refs/heads/trunk 7a3e697d8 -> f8b1a9e15
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/31414fb8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/31414fb8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/31414fb8
Branch: refs/heads/cassandra-1.2
Commit: 31414fb871c073a19a02dce5dda70bf3df0e5888
Parents: 8b6d87b
Author: Brandon Williams <br...@apache.org>
Authored: Fri Feb 7 08:34:00 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Feb 7 08:34:00 2014 -0600
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/MigrationManager.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/31414fb8/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 37d5f43..fd9eeda 100644
--- a/src/java/org/apache/cassandra/service/MigrationManager.java
+++ b/src/java/org/apache/cassandra/service/MigrationManager.java
@@ -138,9 +138,10 @@ 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.VERSION_117
- && MessagingService.instance().getVersion(endpoint) <= MessagingService.current_version
- && !Gossiper.instance.isFatClient(endpoint);
+ return MessagingService.instance().knowsVersion(endpoint)
+ && MessagingService.instance().getVersion(endpoint) >= MessagingService.VERSION_117
+ && MessagingService.instance().getVersion(endpoint) <= MessagingService.current_version
+ && !Gossiper.instance.isFatClient(endpoint);
}
public static boolean isReadyForBootstrap()
[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
Posted by br...@apache.org.
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 <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()
[2/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
Posted by br...@apache.org.
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/31414fb8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/31414fb8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/31414fb8
Branch: refs/heads/cassandra-2.0
Commit: 31414fb871c073a19a02dce5dda70bf3df0e5888
Parents: 8b6d87b
Author: Brandon Williams <br...@apache.org>
Authored: Fri Feb 7 08:34:00 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Feb 7 08:34:00 2014 -0600
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/MigrationManager.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/31414fb8/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 37d5f43..fd9eeda 100644
--- a/src/java/org/apache/cassandra/service/MigrationManager.java
+++ b/src/java/org/apache/cassandra/service/MigrationManager.java
@@ -138,9 +138,10 @@ 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.VERSION_117
- && MessagingService.instance().getVersion(endpoint) <= MessagingService.current_version
- && !Gossiper.instance.isFatClient(endpoint);
+ return MessagingService.instance().knowsVersion(endpoint)
+ && MessagingService.instance().getVersion(endpoint) >= MessagingService.VERSION_117
+ && MessagingService.instance().getVersion(endpoint) <= MessagingService.current_version
+ && !Gossiper.instance.isFatClient(endpoint);
}
public static boolean isReadyForBootstrap()
[5/8] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by br...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fe5de338
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fe5de338
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fe5de338
Branch: refs/heads/trunk
Commit: fe5de33838c5d7ca5ec1000140d9778a9767fe34
Parents: 6e0ce7a 31414fb
Author: Brandon Williams <br...@apache.org>
Authored: Fri Feb 7 08:35:02 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Feb 7 08:35:02 2014 -0600
----------------------------------------------------------------------
----------------------------------------------------------------------
[8/8] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by br...@apache.org.
Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f8b1a9e1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f8b1a9e1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f8b1a9e1
Branch: refs/heads/trunk
Commit: f8b1a9e1590dd8b0b2c4a4d698b8d3e2765f0cb3
Parents: 7a3e697 9e0700c
Author: Brandon Williams <br...@apache.org>
Authored: Fri Feb 7 08:36:00 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Feb 7 08:36:00 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/f8b1a9e1/src/java/org/apache/cassandra/service/MigrationManager.java
----------------------------------------------------------------------
[3/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
Posted by br...@apache.org.
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/31414fb8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/31414fb8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/31414fb8
Branch: refs/heads/trunk
Commit: 31414fb871c073a19a02dce5dda70bf3df0e5888
Parents: 8b6d87b
Author: Brandon Williams <br...@apache.org>
Authored: Fri Feb 7 08:34:00 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Feb 7 08:34:00 2014 -0600
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/MigrationManager.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/31414fb8/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 37d5f43..fd9eeda 100644
--- a/src/java/org/apache/cassandra/service/MigrationManager.java
+++ b/src/java/org/apache/cassandra/service/MigrationManager.java
@@ -138,9 +138,10 @@ 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.VERSION_117
- && MessagingService.instance().getVersion(endpoint) <= MessagingService.current_version
- && !Gossiper.instance.isFatClient(endpoint);
+ return MessagingService.instance().knowsVersion(endpoint)
+ && MessagingService.instance().getVersion(endpoint) >= MessagingService.VERSION_117
+ && MessagingService.instance().getVersion(endpoint) <= MessagingService.current_version
+ && !Gossiper.instance.isFatClient(endpoint);
}
public static boolean isReadyForBootstrap()
[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
Posted by br...@apache.org.
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()
[4/8] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by br...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fe5de338
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fe5de338
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fe5de338
Branch: refs/heads/cassandra-2.0
Commit: fe5de33838c5d7ca5ec1000140d9778a9767fe34
Parents: 6e0ce7a 31414fb
Author: Brandon Williams <br...@apache.org>
Authored: Fri Feb 7 08:35:02 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Feb 7 08:35:02 2014 -0600
----------------------------------------------------------------------
----------------------------------------------------------------------