Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 40E45200CF8 for ; Wed, 30 Aug 2017 15:35:11 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 3DC08168F85; Wed, 30 Aug 2017 13:35:11 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 8C87A168F89 for ; Wed, 30 Aug 2017 15:35:10 +0200 (CEST) Received: (qmail 27819 invoked by uid 500); 30 Aug 2017 13:35:09 -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 27629 invoked by uid 99); 30 Aug 2017 13:35:08 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 30 Aug 2017 13:35:08 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 03242E7DF3; Wed, 30 Aug 2017 13:35:07 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jasobrown@apache.org To: commits@cassandra.apache.org Date: Wed, 30 Aug 2017 13:35:09 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/6] cassandra git commit: enable segement creation before recovering commitlogs archived-at: Wed, 30 Aug 2017 13:35:11 -0000 enable segement creation before recovering commitlogs patch by Jaydeepkumar Chovatia, reviewed by jasobrown for CASSANDRA-13587 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d03c046a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d03c046a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d03c046a Branch: refs/heads/trunk Commit: d03c046acbcfe3e3a9d8fafa628030cc3fc40f34 Parents: d981309 Author: Jaydeepkumar Chovatia Authored: Fri Jun 9 16:08:32 2017 -0700 Committer: Jason Brown Committed: Wed Aug 30 06:33:30 2017 -0700 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/commitlog/CommitLog.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d03c046a/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 6609b05..452dc9b 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 3.0.15 + * enable segement creation before recovering commitlogs (CASSANDRA-13587) * Fix AssertionError in short read protection (CASSANDRA-13747) * Don't skip corrupted sstables on startup (CASSANDRA-13620) * Fix the merging of cells with different user type versions (CASSANDRA-13776) http://git-wip-us.apache.org/repos/asf/cassandra/blob/d03c046a/src/java/org/apache/cassandra/db/commitlog/CommitLog.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/commitlog/CommitLog.java b/src/java/org/apache/cassandra/db/commitlog/CommitLog.java index d167735..40040ed 100644 --- a/src/java/org/apache/cassandra/db/commitlog/CommitLog.java +++ b/src/java/org/apache/cassandra/db/commitlog/CommitLog.java @@ -150,6 +150,7 @@ public class CommitLog implements CommitLogMBean File[] files = new File(DatabaseDescriptor.getCommitLogLocation()).listFiles(unmanagedFilesFilter); int replayed = 0; + allocator.enableReserveSegmentCreation(); if (files.length == 0) { logger.info("No commitlog files found; skipping replay"); @@ -165,7 +166,6 @@ public class CommitLog implements CommitLogMBean allocator.recycleSegment(f); } - allocator.enableReserveSegmentCreation(); return replayed; } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org For additional commands, e-mail: commits-help@cassandra.apache.org