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

Fix incremental repair not remove parent session on remote 

patch by yukim; reveiwed by krummas for CASSANDRA-8291
This commit is contained in:
Yuki Morishita 2014-11-11 10:08:27 -06:00
parent 3484181e2b
commit feb26752b2
3 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

@ -2,6 +2,7 @@
* Support for frozen collections (CASSANDRA-7859)
* Fix overflow on histogram computation (CASSANDRA-8028)
* Have paxos reuse the timestamp generation of normal queries (CASSANDRA-7801)
* Fix incremental repair not remove parent session on remote (CASSANDRA-8291)
Merged from 2.0:
* Disable SSLv3 for POODLE (CASSANDRA-8265)
* Fix millisecond timestamps in Tracing (CASSANDRA-8297)

4
src/java/org/apache/cassandra/repair/RepairMessageVerbHandler.java
View File

@ -119,6 +119,10 @@ public class RepairMessageVerbHandler implements IVerbHandler<RepairMessage>
{
throw new RuntimeException(e);
}
finally
{
ActiveRepairService.instance.removeParentRepairSession(anticompactionRequest.parentRepairSession);
}
break;

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

@ -343,6 +343,11 @@ public class ActiveRepairService
return parentRepairSessions.get(parentSessionId);
}
public ParentRepairSession removeParentRepairSession(UUID parentSessionId)
{
return parentRepairSessions.remove(parentSessionId);
}
public List<Future<?>> doAntiCompaction(UUID parentRepairSession) throws InterruptedException, ExecutionException, IOException
{
assert parentRepairSession != null;