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/d305ce42 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d305ce42 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d305ce42 Branch: refs/heads/trunk Commit: d305ce42fc727c6251fc682fcc2168e410e33e99 Parents: 6404e01 9b6f55b Author: Yuki Morishita <[email protected]> Authored: Fri May 1 14:49:01 2015 -0500 Committer: Yuki Morishita <[email protected]> Committed: Fri May 1 14:49:01 2015 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/repair/SnapshotTask.java | 5 +++-- src/java/org/apache/cassandra/service/ActiveRepairService.java | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d305ce42/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d305ce42/src/java/org/apache/cassandra/repair/SnapshotTask.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d305ce42/src/java/org/apache/cassandra/service/ActiveRepairService.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/service/ActiveRepairService.java index edae0f2,ac5ed99..6f42bce --- a/src/java/org/apache/cassandra/service/ActiveRepairService.java +++ b/src/java/org/apache/cassandra/service/ActiveRepairService.java @@@ -262,11 -278,11 +262,11 @@@ public class ActiveRepairServic for (ColumnFamilyStore cfs : columnFamilyStores) cfIds.add(cfs.metadata.cfId); - for(InetAddress neighbour : endpoints) + for (InetAddress neighbour : endpoints) { - PrepareMessage message = new PrepareMessage(parentRepairSession, cfIds, ranges); + PrepareMessage message = new PrepareMessage(parentRepairSession, cfIds, options.getRanges(), options.isIncremental()); MessageOut<RepairMessage> msg = message.createMessage(); - MessagingService.instance().sendRRWithFailure(msg, neighbour, callback); + MessagingService.instance().sendRR(msg, neighbour, callback, TimeUnit.HOURS.toMillis(1), true); } try {
