Repository: cassandra Updated Branches: refs/heads/cassandra-3.0 d98130985 -> d03c046ac refs/heads/cassandra-3.11 f679b6fc3 -> 6d6081e3c refs/heads/trunk 3ce8e24ac -> 76efcc699
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/cassandra-3.0 Commit: d03c046acbcfe3e3a9d8fafa628030cc3fc40f34 Parents: d981309 Author: Jaydeepkumar Chovatia <chovatia.jayd...@gmail.com> Authored: Fri Jun 9 16:08:32 2017 -0700 Committer: Jason Brown <jasedbr...@gmail.com> 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-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org