You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by st...@apache.org on 2016/12/20 02:12:59 UTC
[01/21] cassandra git commit: Fix missed signal when commit log
segments are recycled
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 <st...@datastax.com>
Authored: Wed Dec 14 14:15:14 2016 +0800
Committer: Stefania Alborghetti <st...@datastax.com>
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();
}
[10/21] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by st...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e032bea8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e032bea8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e032bea8
Branch: refs/heads/cassandra-2.2
Commit: e032bea8f26b3dc26fefd9b1f594b0ef49448f55
Parents: 66f1aaf c25fcab
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Tue Dec 20 10:09:35 2016 +0800
Committer: Stefania Alborghetti <st...@datastax.com>
Committed: Tue Dec 20 10:09:35 2016 +0800
----------------------------------------------------------------------
----------------------------------------------------------------------
[16/21] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.11
Posted by st...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e35f4f9d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e35f4f9d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e35f4f9d
Branch: refs/heads/cassandra-3.11
Commit: e35f4f9d73756a86ce397f20fac56ad66d900a23
Parents: 01cb787 194354d
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Tue Dec 20 10:10:35 2016 +0800
Committer: Stefania Alborghetti <st...@datastax.com>
Committed: Tue Dec 20 10:10:35 2016 +0800
----------------------------------------------------------------------
----------------------------------------------------------------------
[15/21] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by st...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/194354d2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/194354d2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/194354d2
Branch: refs/heads/cassandra-3.11
Commit: 194354d29f3fd6514f4550954b27e28326a06c69
Parents: c612cd8 e032bea
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Tue Dec 20 10:10:13 2016 +0800
Committer: Stefania Alborghetti <st...@datastax.com>
Committed: Tue Dec 20 10:10:13 2016 +0800
----------------------------------------------------------------------
----------------------------------------------------------------------
[17/21] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.11
Posted by st...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e35f4f9d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e35f4f9d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e35f4f9d
Branch: refs/heads/trunk
Commit: e35f4f9d73756a86ce397f20fac56ad66d900a23
Parents: 01cb787 194354d
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Tue Dec 20 10:10:35 2016 +0800
Committer: Stefania Alborghetti <st...@datastax.com>
Committed: Tue Dec 20 10:10:35 2016 +0800
----------------------------------------------------------------------
----------------------------------------------------------------------
[08/21] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by st...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e032bea8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e032bea8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e032bea8
Branch: refs/heads/cassandra-3.0
Commit: e032bea8f26b3dc26fefd9b1f594b0ef49448f55
Parents: 66f1aaf c25fcab
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Tue Dec 20 10:09:35 2016 +0800
Committer: Stefania Alborghetti <st...@datastax.com>
Committed: Tue Dec 20 10:09:35 2016 +0800
----------------------------------------------------------------------
----------------------------------------------------------------------
[20/21] cassandra git commit: Merge branch 'cassandra-3.11' into
cassandra-3.X
Posted by st...@apache.org.
Merge branch 'cassandra-3.11' into cassandra-3.X
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2df8112d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2df8112d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2df8112d
Branch: refs/heads/trunk
Commit: 2df8112d92464ebcfa540905386b6de12811d70b
Parents: 5d48b0d e35f4f9
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Tue Dec 20 10:11:05 2016 +0800
Committer: Stefania Alborghetti <st...@datastax.com>
Committed: Tue Dec 20 10:11:05 2016 +0800
----------------------------------------------------------------------
----------------------------------------------------------------------
[03/21] cassandra git commit: Fix missed signal when commit log
segments are recycled
Posted by st...@apache.org.
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-3.X
Commit: c25fcabe2451d763c192cb808a38a009c16967f8
Parents: 3ec7cb0
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Wed Dec 14 14:15:14 2016 +0800
Committer: Stefania Alborghetti <st...@datastax.com>
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();
}
[07/21] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by st...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e032bea8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e032bea8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e032bea8
Branch: refs/heads/cassandra-3.X
Commit: e032bea8f26b3dc26fefd9b1f594b0ef49448f55
Parents: 66f1aaf c25fcab
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Tue Dec 20 10:09:35 2016 +0800
Committer: Stefania Alborghetti <st...@datastax.com>
Committed: Tue Dec 20 10:09:35 2016 +0800
----------------------------------------------------------------------
----------------------------------------------------------------------
[05/21] cassandra git commit: Fix missed signal when commit log
segments are recycled
Posted by st...@apache.org.
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-3.11
Commit: c25fcabe2451d763c192cb808a38a009c16967f8
Parents: 3ec7cb0
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Wed Dec 14 14:15:14 2016 +0800
Committer: Stefania Alborghetti <st...@datastax.com>
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();
}
[11/21] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by st...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e032bea8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e032bea8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e032bea8
Branch: refs/heads/cassandra-3.11
Commit: e032bea8f26b3dc26fefd9b1f594b0ef49448f55
Parents: 66f1aaf c25fcab
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Tue Dec 20 10:09:35 2016 +0800
Committer: Stefania Alborghetti <st...@datastax.com>
Committed: Tue Dec 20 10:09:35 2016 +0800
----------------------------------------------------------------------
----------------------------------------------------------------------
[14/21] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by st...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/194354d2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/194354d2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/194354d2
Branch: refs/heads/cassandra-3.0
Commit: 194354d29f3fd6514f4550954b27e28326a06c69
Parents: c612cd8 e032bea
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Tue Dec 20 10:10:13 2016 +0800
Committer: Stefania Alborghetti <st...@datastax.com>
Committed: Tue Dec 20 10:10:13 2016 +0800
----------------------------------------------------------------------
----------------------------------------------------------------------
[19/21] cassandra git commit: Merge branch 'cassandra-3.11' into
cassandra-3.X
Posted by st...@apache.org.
Merge branch 'cassandra-3.11' into cassandra-3.X
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2df8112d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2df8112d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2df8112d
Branch: refs/heads/cassandra-3.X
Commit: 2df8112d92464ebcfa540905386b6de12811d70b
Parents: 5d48b0d e35f4f9
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Tue Dec 20 10:11:05 2016 +0800
Committer: Stefania Alborghetti <st...@datastax.com>
Committed: Tue Dec 20 10:11:05 2016 +0800
----------------------------------------------------------------------
----------------------------------------------------------------------
[09/21] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by st...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e032bea8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e032bea8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e032bea8
Branch: refs/heads/trunk
Commit: e032bea8f26b3dc26fefd9b1f594b0ef49448f55
Parents: 66f1aaf c25fcab
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Tue Dec 20 10:09:35 2016 +0800
Committer: Stefania Alborghetti <st...@datastax.com>
Committed: Tue Dec 20 10:09:35 2016 +0800
----------------------------------------------------------------------
----------------------------------------------------------------------
[18/21] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.11
Posted by st...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e35f4f9d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e35f4f9d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e35f4f9d
Branch: refs/heads/cassandra-3.X
Commit: e35f4f9d73756a86ce397f20fac56ad66d900a23
Parents: 01cb787 194354d
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Tue Dec 20 10:10:35 2016 +0800
Committer: Stefania Alborghetti <st...@datastax.com>
Committed: Tue Dec 20 10:10:35 2016 +0800
----------------------------------------------------------------------
----------------------------------------------------------------------
[12/21] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by st...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/194354d2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/194354d2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/194354d2
Branch: refs/heads/trunk
Commit: 194354d29f3fd6514f4550954b27e28326a06c69
Parents: c612cd8 e032bea
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Tue Dec 20 10:10:13 2016 +0800
Committer: Stefania Alborghetti <st...@datastax.com>
Committed: Tue Dec 20 10:10:13 2016 +0800
----------------------------------------------------------------------
----------------------------------------------------------------------
[06/21] cassandra git commit: Fix missed signal when commit log
segments are recycled
Posted by st...@apache.org.
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/trunk
Commit: c25fcabe2451d763c192cb808a38a009c16967f8
Parents: 3ec7cb0
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Wed Dec 14 14:15:14 2016 +0800
Committer: Stefania Alborghetti <st...@datastax.com>
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();
}
[21/21] cassandra git commit: Merge branch 'cassandra-3.X' into trunk
Posted by st...@apache.org.
Merge branch 'cassandra-3.X' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ece8dca6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ece8dca6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ece8dca6
Branch: refs/heads/trunk
Commit: ece8dca6fd17e6ee7aa3daaae0d64a37d5d46042
Parents: 2218d21 2df8112
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Tue Dec 20 10:11:31 2016 +0800
Committer: Stefania Alborghetti <st...@datastax.com>
Committed: Tue Dec 20 10:11:31 2016 +0800
----------------------------------------------------------------------
----------------------------------------------------------------------
[13/21] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by st...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/194354d2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/194354d2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/194354d2
Branch: refs/heads/cassandra-3.X
Commit: 194354d29f3fd6514f4550954b27e28326a06c69
Parents: c612cd8 e032bea
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Tue Dec 20 10:10:13 2016 +0800
Committer: Stefania Alborghetti <st...@datastax.com>
Committed: Tue Dec 20 10:10:13 2016 +0800
----------------------------------------------------------------------
----------------------------------------------------------------------
[04/21] cassandra git commit: Fix missed signal when commit log
segments are recycled
Posted by st...@apache.org.
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-3.0
Commit: c25fcabe2451d763c192cb808a38a009c16967f8
Parents: 3ec7cb0
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Wed Dec 14 14:15:14 2016 +0800
Committer: Stefania Alborghetti <st...@datastax.com>
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();
}
[02/21] cassandra git commit: Fix missed signal when commit log
segments are recycled
Posted by st...@apache.org.
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.2
Commit: c25fcabe2451d763c192cb808a38a009c16967f8
Parents: 3ec7cb0
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Wed Dec 14 14:15:14 2016 +0800
Committer: Stefania Alborghetti <st...@datastax.com>
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();
}