Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 48ffe535b -> 2a4daaf15
followup fix for 8564 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2a4daaf1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2a4daaf1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2a4daaf1 Branch: refs/heads/cassandra-2.1 Commit: 2a4daaf15b6134e9f21d9638112183853284d008 Parents: 48ffe53 Author: T Jake Luciani <j...@apache.org> Authored: Wed May 13 14:16:00 2015 -0400 Committer: T Jake Luciani <j...@apache.org> Committed: Wed May 13 14:16:00 2015 -0400 ---------------------------------------------------------------------- src/java/org/apache/cassandra/service/StorageService.java | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2a4daaf1/src/java/org/apache/cassandra/service/StorageService.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java index b6c6ecf..1ea915b 100644 --- a/src/java/org/apache/cassandra/service/StorageService.java +++ b/src/java/org/apache/cassandra/service/StorageService.java @@ -3770,6 +3770,8 @@ public class StorageService extends NotificationBroadcasterSupport implements IE */ public synchronized void drain() throws IOException, InterruptedException, ExecutionException { + inShutdownHook = true; + ExecutorService counterMutationStage = StageManager.getStage(Stage.COUNTER_MUTATION); ExecutorService mutationStage = StageManager.getStage(Stage.MUTATION); if (mutationStage.isTerminated() && counterMutationStage.isTerminated())