Repository: cassandra Updated Branches: refs/heads/trunk 839bfab16 -> b2ecf7be3
Make HHOM.compact synchronized to avoid compacting the same sstables Patch by marcuse; reviewed by Aleksey Yeschenko for CASSANDRA-8416 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c26a7e76 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c26a7e76 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c26a7e76 Branch: refs/heads/trunk Commit: c26a7e767a22687fa5c47d759a7a32acbbaa8ec6 Parents: a910930 Author: Marcus Eriksson <marc...@apache.org> Authored: Wed Dec 3 19:26:23 2014 +0100 Committer: Marcus Eriksson <marc...@apache.org> Committed: Mon Dec 8 08:58:50 2014 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/HintedHandOffManager.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c26a7e76/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 79c2d81..5573316 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.0.12: + * Make HHOM.compact synchronized (CASSANDRA-8416) * cancel latency-sampling task when CF is dropped (CASSANDRA-8401) * don't block SocketThread for MessagingService (CASSANDRA-8188) * Increase quarantine delay on replacement (CASSANDRA-8260) http://git-wip-us.apache.org/repos/asf/cassandra/blob/c26a7e76/src/java/org/apache/cassandra/db/HintedHandOffManager.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/HintedHandOffManager.java b/src/java/org/apache/cassandra/db/HintedHandOffManager.java index c2e4d0d..87260b2 100644 --- a/src/java/org/apache/cassandra/db/HintedHandOffManager.java +++ b/src/java/org/apache/cassandra/db/HintedHandOffManager.java @@ -251,7 +251,7 @@ public class HintedHandOffManager implements HintedHandOffManagerMBean } @VisibleForTesting - protected void compact() + protected synchronized void compact() { ArrayList<Descriptor> descriptors = new ArrayList<>(); for (SSTable sstable : hintStore.getDataTracker().getUncompactingSSTables())
