You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2014/06/04 21:30:02 UTC
[1/3] git commit: close segments in resetUnsafe patch by Ala'
Alkhaldi; reviewed by Joshua McKenzie for CASSANDRA-7334
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 8e85f0c32 -> 285c369ac
refs/heads/trunk 087394c8a -> 2306fb877
close segments in resetUnsafe
patch by Ala' Alkhaldi; reviewed by Joshua McKenzie for CASSANDRA-7334
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/285c369a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/285c369a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/285c369a
Branch: refs/heads/cassandra-2.1
Commit: 285c369ac7910d24b7260a3d96a67de9257cb9bd
Parents: 8e85f0c
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Jun 4 14:29:48 2014 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Jun 4 14:29:48 2014 -0500
----------------------------------------------------------------------
.../apache/cassandra/db/commitlog/CommitLogSegmentManager.java | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/285c369a/src/java/org/apache/cassandra/db/commitlog/CommitLogSegmentManager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/commitlog/CommitLogSegmentManager.java b/src/java/org/apache/cassandra/db/commitlog/CommitLogSegmentManager.java
index 5802e8a..117b9d1 100644
--- a/src/java/org/apache/cassandra/db/commitlog/CommitLogSegmentManager.java
+++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogSegmentManager.java
@@ -484,8 +484,14 @@ public class CommitLogSegmentManager
while (!segmentManagementTasks.isEmpty())
Thread.yield();
+ for (CommitLogSegment segment : activeSegments)
+ segment.close();
activeSegments.clear();
+
+ for (CommitLogSegment segment : availableSegments)
+ segment.close();
availableSegments.clear();
+
allocatingFrom = null;
}
[2/3] git commit: close segments in resetUnsafe patch by Ala'
Alkhaldi; reviewed by Joshua McKenzie for CASSANDRA-7334
Posted by jb...@apache.org.
close segments in resetUnsafe
patch by Ala' Alkhaldi; reviewed by Joshua McKenzie for CASSANDRA-7334
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/285c369a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/285c369a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/285c369a
Branch: refs/heads/trunk
Commit: 285c369ac7910d24b7260a3d96a67de9257cb9bd
Parents: 8e85f0c
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Jun 4 14:29:48 2014 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Jun 4 14:29:48 2014 -0500
----------------------------------------------------------------------
.../apache/cassandra/db/commitlog/CommitLogSegmentManager.java | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/285c369a/src/java/org/apache/cassandra/db/commitlog/CommitLogSegmentManager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/commitlog/CommitLogSegmentManager.java b/src/java/org/apache/cassandra/db/commitlog/CommitLogSegmentManager.java
index 5802e8a..117b9d1 100644
--- a/src/java/org/apache/cassandra/db/commitlog/CommitLogSegmentManager.java
+++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogSegmentManager.java
@@ -484,8 +484,14 @@ public class CommitLogSegmentManager
while (!segmentManagementTasks.isEmpty())
Thread.yield();
+ for (CommitLogSegment segment : activeSegments)
+ segment.close();
activeSegments.clear();
+
+ for (CommitLogSegment segment : availableSegments)
+ segment.close();
availableSegments.clear();
+
allocatingFrom = null;
}
[3/3] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by jb...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2306fb87
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2306fb87
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2306fb87
Branch: refs/heads/trunk
Commit: 2306fb8770244783182b311fd6085dcc4db90e9e
Parents: 087394c 285c369
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Jun 4 14:29:55 2014 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Jun 4 14:29:55 2014 -0500
----------------------------------------------------------------------
.../apache/cassandra/db/commitlog/CommitLogSegmentManager.java | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------