natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

revert CASSANDRA-5523

This commit is contained in:
Yuki Morishita 2013-05-13 20:53:57 -05:00
parent fe10ba7df3
commit 11b0cfbe71
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -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)

9
src/java/org/apache/cassandra/service/AntiEntropyService.java
View File

@ -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;
}
}