Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 7e6d9eb84 -> 739f9ce38
Make sure we unmark compacting after scrub/cleanup/upgradesstables Patch by marcuse; reviewed by yukim for CASSANDRA-8548 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c5ccdb76 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c5ccdb76 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c5ccdb76 Branch: refs/heads/cassandra-2.1 Commit: c5ccdb7665bf16fc18f336e3967e15ac9266832d Parents: 9e5a4fa Author: Marcus Eriksson <[email protected]> Authored: Thu Jan 8 15:43:31 2015 +0100 Committer: Marcus Eriksson <[email protected]> Committed: Wed Jan 14 09:49:36 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/db/compaction/CompactionManager.java | 10 ++++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c5ccdb76/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 9b20a06..a711790 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.0.12: + * Make sure we unmark compacting after scrub/cleanup etc (CASSANDRA-8548) * Check for available disk space before starting a compaction (CASSANDRA-8562) * Fix DISTINCT queries with LIMITs or paging when some partitions contain only tombstones (CASSANDRA-8490) http://git-wip-us.apache.org/repos/asf/cassandra/blob/c5ccdb76/src/java/org/apache/cassandra/db/compaction/CompactionManager.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java index 19dedb0..62599e3 100644 --- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java +++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java @@ -220,8 +220,14 @@ public class CompactionManager implements CompactionManagerMBean { public Object call() throws IOException { - operation.perform(cfs, sstables); - cfs.getDataTracker().unmarkCompacting(sstables); + try + { + operation.perform(cfs, sstables); + } + finally + { + cfs.getDataTracker().unmarkCompacting(sstables); + } return this; } };
