Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a4f32c5a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a4f32c5a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a4f32c5a Branch: refs/heads/cassandra-3.0 Commit: a4f32c5af6974cec9d3d18bcec3c0ea683ab1045 Parents: db7feb4 32f22a4 Author: Yuki Morishita <[email protected]> Authored: Mon Oct 26 12:19:21 2015 -0500 Committer: Yuki Morishita <[email protected]> Committed: Mon Oct 26 12:19:21 2015 -0500 ---------------------------------------------------------------------- .../db/compaction/CompactionManager.java | 32 ++++++++++++++++++++ .../cassandra/service/StorageService.java | 3 ++ 2 files changed, 35 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a4f32c5a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a4f32c5a/src/java/org/apache/cassandra/service/StorageService.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/service/StorageService.java index 9153cd8,f162f7c..fb1edf6 --- a/src/java/org/apache/cassandra/service/StorageService.java +++ b/src/java/org/apache/cassandra/service/StorageService.java @@@ -3946,10 -3899,11 +3946,13 @@@ public class StorageService extends Not } FBUtilities.waitOnFutures(flushes); - BatchlogManager.shutdown(); + BatchlogManager.instance.shutdown(); + + HintsService.instance.shutdownBlocking(); + // Interrupt on going compaction and shutdown to prevent further compaction + CompactionManager.instance.forceShutdown(); + // whilst we've flushed all the CFs, which will have recycled all completed segments, we want to ensure // there are no segments to replay, so we force the recycling of any remaining (should be at most one) CommitLog.instance.forceRecycleAllSegments();
