Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7c9043c6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7c9043c6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7c9043c6 Branch: refs/heads/trunk Commit: 7c9043c679100ba3510ad0bd18bdf8004084bb20 Parents: c023d49 2943684 Author: Yuki Morishita <[email protected]> Authored: Mon Nov 24 18:49:13 2014 -0600 Committer: Yuki Morishita <[email protected]> Committed: Mon Nov 24 18:49:13 2014 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/service/ActiveRepairService.java | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7c9043c6/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7c9043c6/src/java/org/apache/cassandra/service/ActiveRepairService.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/service/ActiveRepairService.java index 15d786e,17cf6ef..252bcd1 --- a/src/java/org/apache/cassandra/service/ActiveRepairService.java +++ b/src/java/org/apache/cassandra/service/ActiveRepairService.java @@@ -229,12 -241,13 +229,13 @@@ public class ActiveRepairServic return neighbors; } - public UUID prepareForRepair(Set<InetAddress> endpoints, Collection<Range<Token>> ranges, List<ColumnFamilyStore> columnFamilyStores) + public UUID prepareForRepair(Set<InetAddress> endpoints, RepairOption options, List<ColumnFamilyStore> columnFamilyStores) { UUID parentRepairSession = UUIDGen.getTimeUUID(); - registerParentRepairSession(parentRepairSession, columnFamilyStores, ranges); + registerParentRepairSession(parentRepairSession, columnFamilyStores, options.getRanges(), options.isIncremental()); final CountDownLatch prepareLatch = new CountDownLatch(endpoints.size()); final AtomicBoolean status = new AtomicBoolean(true); + final Set<String> failedNodes = Collections.synchronizedSet(new HashSet<String>()); IAsyncCallbackWithFailure callback = new IAsyncCallbackWithFailure() { public void response(MessageIn msg)
