Make user-defined compactionJMX blocking patch by jbellis; reviewed by Michael Harris for CASSANDRA-4952
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a4dd7aa3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a4dd7aa3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a4dd7aa3 Branch: refs/heads/trunk Commit: a4dd7aa39277c6c7426b9e05e2d3676bc428692a Parents: 4b805ad Author: Jonathan Ellis <[email protected]> Authored: Mon Aug 26 17:53:44 2013 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Mon Aug 26 17:53:44 2013 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/db/compaction/CompactionManager.java | 7 ++----- 2 files changed, 3 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a4dd7aa3/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 13b4214..45e6497 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,5 +1,6 @@ 1.2.10 * Allow disabling SlabAllocator (CASSANDRA-5935) + * Make user-defined compaction JMX blocking (CASSANDRA-4952) 1.2.9 http://git-wip-us.apache.org/repos/asf/cassandra/blob/a4dd7aa3/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 c9e1b79..44b973f 100644 --- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java +++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java @@ -56,10 +56,7 @@ import org.apache.cassandra.metrics.CompactionMetrics; import org.apache.cassandra.service.AntiEntropyService; import org.apache.cassandra.service.CacheService; import org.apache.cassandra.service.StorageService; -import org.apache.cassandra.utils.CloseableIterator; -import org.apache.cassandra.utils.CounterId; -import org.apache.cassandra.utils.Pair; -import org.apache.cassandra.utils.WrappedRunnable; +import org.apache.cassandra.utils.*; /** * A singleton which manages a private executor of ongoing compactions. A readwrite lock @@ -405,7 +402,7 @@ public class CompactionManager implements CompactionManagerMBean } ColumnFamilyStore cfs = Table.open(ksname).getColumnFamilyStore(cfname); - submitUserDefined(cfs, descriptors, getDefaultGcBefore(cfs)); + FBUtilities.waitOnFuture(submitUserDefined(cfs, descriptors, getDefaultGcBefore(cfs))); } public Future<?> submitUserDefined(final ColumnFamilyStore cfs, final Collection<Descriptor> dataFiles, final int gcBefore)
