Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7d6474bb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7d6474bb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7d6474bb Branch: refs/heads/cassandra-3.11 Commit: 7d6474bb4d5e8fe940ad0a75652524ca221dab62 Parents: df37bcb 49edd70 Author: Blake Eggleston <bdeggles...@gmail.com> Authored: Wed Nov 8 16:40:38 2017 -0800 Committer: Blake Eggleston <bdeggles...@gmail.com> Committed: Wed Nov 8 16:42:13 2017 -0800 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/service/ActiveRepairService.java | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7d6474bb/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 83015b1,a94dbc9..6bd6de8 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,9 -1,5 +1,10 @@@ -3.0.16 +3.11.2 + * Add asm jar to build.xml for maven builds (CASSANDRA-11193) + * Round buffer size to powers of 2 for the chunk cache (CASSANDRA-13897) + * Update jackson JSON jars (CASSANDRA-13949) + * Avoid locks when checking LCS fanout and if we should defrag (CASSANDRA-13930) +Merged from 3.0: + * Fix repair race that caused gossip to block (CASSANDRA-13849) * Tracing interferes with digest requests when using RandomPartitioner (CASSANDRA-13964) * Add flag to disable materialized views, and warnings on creation (CASSANDRA-13959) * Don't let user drop or generally break tables in system_distributed (CASSANDRA-13813) http://git-wip-us.apache.org/repos/asf/cassandra/blob/7d6474bb/src/java/org/apache/cassandra/service/ActiveRepairService.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/service/ActiveRepairService.java index fea690e,adb6fab..626aa91 --- a/src/java/org/apache/cassandra/service/ActiveRepairService.java +++ b/src/java/org/apache/cassandra/service/ActiveRepairService.java @@@ -283,9 -280,9 +283,9 @@@ public class ActiveRepairService implem return neighbors; } - public synchronized UUID prepareForRepair(UUID parentRepairSession, InetAddress coordinator, Set<InetAddress> endpoints, RepairOption options, List<ColumnFamilyStore> columnFamilyStores) + public UUID prepareForRepair(UUID parentRepairSession, InetAddress coordinator, Set<InetAddress> endpoints, RepairOption options, List<ColumnFamilyStore> columnFamilyStores) { - long timestamp = System.currentTimeMillis(); + long timestamp = Clock.instance.currentTimeMillis(); registerParentRepairSession(parentRepairSession, coordinator, columnFamilyStores, options.getRanges(), options.isIncremental(), timestamp, options.isGlobal()); final CountDownLatch prepareLatch = new CountDownLatch(endpoints.size()); final AtomicBoolean status = new AtomicBoolean(true); --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
