Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 3484181e2 -> feb26752b refs/heads/trunk 9c66482e1 -> b2808b1dc
Fix incremental repair not remove parent session on remote patch by yukim; reveiwed by krummas for CASSANDRA-8291 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/feb26752 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/feb26752 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/feb26752 Branch: refs/heads/cassandra-2.1 Commit: feb26752b2671801a9d6139c2dc9217ee257505d Parents: 3484181 Author: Yuki Morishita <[email protected]> Authored: Tue Nov 11 10:08:27 2014 -0600 Committer: Yuki Morishita <[email protected]> Committed: Thu Nov 13 12:40:07 2014 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/repair/RepairMessageVerbHandler.java | 4 ++++ src/java/org/apache/cassandra/service/ActiveRepairService.java | 5 +++++ 3 files changed, 10 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/feb26752/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 1910f31..6caa5c7 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -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) http://git-wip-us.apache.org/repos/asf/cassandra/blob/feb26752/src/java/org/apache/cassandra/repair/RepairMessageVerbHandler.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/repair/RepairMessageVerbHandler.java b/src/java/org/apache/cassandra/repair/RepairMessageVerbHandler.java index 54117a3..141e4c7 100644 --- a/src/java/org/apache/cassandra/repair/RepairMessageVerbHandler.java +++ b/src/java/org/apache/cassandra/repair/RepairMessageVerbHandler.java @@ -119,6 +119,10 @@ public class RepairMessageVerbHandler implements IVerbHandler<RepairMessage> { throw new RuntimeException(e); } + finally + { + ActiveRepairService.instance.removeParentRepairSession(anticompactionRequest.parentRepairSession); + } break; http://git-wip-us.apache.org/repos/asf/cassandra/blob/feb26752/src/java/org/apache/cassandra/service/ActiveRepairService.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/ActiveRepairService.java b/src/java/org/apache/cassandra/service/ActiveRepairService.java index 35a86f6..68c2fae 100644 --- a/src/java/org/apache/cassandra/service/ActiveRepairService.java +++ b/src/java/org/apache/cassandra/service/ActiveRepairService.java @@ -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;
