Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id BB1C3107F9 for ; Fri, 11 Apr 2014 18:04:08 +0000 (UTC) Received: (qmail 49879 invoked by uid 500); 11 Apr 2014 18:04:08 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 49850 invoked by uid 500); 11 Apr 2014 18:04:07 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 49583 invoked by uid 99); 11 Apr 2014 18:04:03 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 11 Apr 2014 18:04:03 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 8EADE98B0B8; Fri, 11 Apr 2014 18:04:03 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aleksey@apache.org To: commits@cassandra.apache.org Date: Fri, 11 Apr 2014 18:04:05 -0000 Message-Id: <3b698c864cc341d6956e52c4b8abda54@git.apache.org> In-Reply-To: <2872753307eb426692bb44a7eff43aa2@git.apache.org> References: <2872753307eb426692bb44a7eff43aa2@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1 Merge branch 'cassandra-2.0' into cassandra-2.1 Conflicts: src/java/org/apache/cassandra/service/StorageService.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3f00662a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3f00662a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3f00662a Branch: refs/heads/trunk Commit: 3f00662a199f35275226f5ccfce2b81d227cf38c Parents: 9d08e50 8845c51 Author: Aleksey Yeschenko Authored: Fri Apr 11 21:02:16 2014 +0300 Committer: Aleksey Yeschenko Committed: Fri Apr 11 21:02:16 2014 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/BatchlogManager.java | 2 +- src/java/org/apache/cassandra/service/StorageService.java | 3 +++ 3 files changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3f00662a/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3f00662a/src/java/org/apache/cassandra/db/BatchlogManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3f00662a/src/java/org/apache/cassandra/service/StorageService.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/service/StorageService.java index 3e94172,7382cbd..6e18567 --- a/src/java/org/apache/cassandra/service/StorageService.java +++ b/src/java/org/apache/cassandra/service/StorageService.java @@@ -3543,10 -3461,9 +3543,13 @@@ public class StorageService extends Not } FBUtilities.waitOnFutures(flushes); + BatchlogManager.batchlogTasks.shutdown(); + BatchlogManager.batchlogTasks.awaitTermination(60, TimeUnit.SECONDS); + + // 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(); + ColumnFamilyStore.postFlushExecutor.shutdown(); ColumnFamilyStore.postFlushExecutor.awaitTermination(60, TimeUnit.SECONDS);