Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 3ec7cb0ca -> c25fcabe2 refs/heads/cassandra-2.2 66f1aaf88 -> e032bea8f refs/heads/cassandra-3.0 c612cd8d7 -> 194354d29 refs/heads/cassandra-3.11 01cb7879f -> e35f4f9d7 refs/heads/cassandra-3.X 5d48b0d38 -> 2df8112d9 refs/heads/trunk 2218d2163 -> ece8dca6f
Fix missed signal when commit log segments are recycled patch by Stefania Alborghetti; reviewed by Branimir Lambov for CASSANSRA-13037 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c25fcabe Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c25fcabe Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c25fcabe Branch: refs/heads/cassandra-2.1 Commit: c25fcabe2451d763c192cb808a38a009c16967f8 Parents: 3ec7cb0 Author: Stefania Alborghetti <[email protected]> Authored: Wed Dec 14 14:15:14 2016 +0800 Committer: Stefania Alborghetti <[email protected]> Committed: Tue Dec 20 10:07:38 2016 +0800 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java | 1 + 2 files changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c25fcabe/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 792d6f8..a2e61fb 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.1.17 + * Fix missed signal when commit log segments are recycled (CASSANDRA-13037) * Fix RecoveryManagerTruncateTest (CASSANDRA-12802) * Don't skip sstables based on maxLocalDeletionTime (CASSANDRA-12765) http://git-wip-us.apache.org/repos/asf/cassandra/blob/c25fcabe/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java b/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java index 1093f87..d68b3c7 100644 --- a/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java +++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java @@ -428,6 +428,7 @@ public class CommitLogSegment discardUnusedTail(); waitForModifications(); lastSyncedOffset = buffer.capacity(); + syncComplete.signalAll(); internalClose(); }
