revert CASSANDRA-5523
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/11b0cfbe Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/11b0cfbe Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/11b0cfbe Branch: refs/heads/trunk Commit: 11b0cfbe71aca834b4e60a5262dfb5ee1d945baf Parents: fe10ba7 Author: Yuki Morishita <yu...@apache.org> Authored: Mon May 13 20:53:57 2013 -0500 Committer: Yuki Morishita <yu...@apache.org> Committed: Mon May 13 20:53:57 2013 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 - .../cassandra/service/AntiEntropyService.java | 9 +++------ 2 files changed, 3 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/11b0cfbe/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 740d8e3..df13e6a 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -17,7 +17,6 @@ * Fix repair -snapshot not working (CASSANDRA-5512) * Set isRunning flag later in binary protocol server (CASSANDRA-5467) * Fix use of CQL3 functions with descending clustering order (CASSANDRA-5472) - * Prevent repair when protocol version does not match (CASSANDRA-5523) * Disallow renaming columns one at a time for thrift table in CQL3 (CASSANDRA-5531) * cqlsh: add CLUSTERING ORDER BY support to DESCRIBE (CASSANDRA-5528) http://git-wip-us.apache.org/repos/asf/cassandra/blob/11b0cfbe/src/java/org/apache/cassandra/service/AntiEntropyService.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/AntiEntropyService.java b/src/java/org/apache/cassandra/service/AntiEntropyService.java index f41089e..eafab67 100644 --- a/src/java/org/apache/cassandra/service/AntiEntropyService.java +++ b/src/java/org/apache/cassandra/service/AntiEntropyService.java @@ -668,13 +668,10 @@ public class AntiEntropyService throw new IOException(message); } - // All endpoints should be on the same protocol version - if (!MessagingService.instance().knowsVersion(endpoint) || MessagingService.instance().getVersion(endpoint) != MessagingService.current_version) + if (MessagingService.instance().getVersion(endpoint) < MessagingService.VERSION_11 && isSequential) { - String message = "Cannot repair among different protocol versions"; - differencingDone.signalAll(); - logger.error(String.format("[repair #%s] ", getName()) + message); - throw new IOException(message); + logger.info(String.format("[repair #%s] Cannot repair using snapshots as node %s is pre-1.1", getName(), endpoint)); + return; } }