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

Merge branch 'cassandra-1.2' into trunk 

Conflicts:
	src/java/org/apache/cassandra/service/ActiveRepairService.java
This commit is contained in:
Yuki Morishita 2013-04-30 14:29:43 -05:00
parent 526f98f1fa fbc4bbcecf
commit a9d97e381e
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -55,6 +55,7 @@
* Fix repair -snapshot not working (CASSANDRA-5512)
* Set isRunning flag later in binary protocol server (CASSANDRA-5467)
* Fix use of CQL3 functions with descencind clustering order (CASSANDRA-5472)
* Prevent repair when protocol version does not match (CASSANDRA-5523)
Merged from 1.1
* Add retry mechanism to OTC for non-droppable_verbs (CASSANDRA-5393)
* Use allocator information to improve memtable memory usage estimate

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

@ -658,6 +658,15 @@ public class ActiveRepairService
logger.error(String.format("[repair #%s] ", getName()) + message);
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)
{
String message = "Cannot repair among different protocol versions";
differencingDone.signalAll();
logger.error(String.format("[repair #%s] ", getName()) + message);
throw new IOException(message);
}
}
ActiveRepairService.instance.sessions.put(getName(), this);