You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ma...@apache.org on 2015/01/14 09:55:13 UTC
[1/3] cassandra git commit: Make sure we unmark compacting after
scrub/cleanup/upgradesstables
Repository: cassandra
Updated Branches:
refs/heads/trunk b8dd3bd75 -> f01b3194e
Make sure we unmark compacting after scrub/cleanup/upgradesstables
Patch by marcuse; reviewed by yukim for CASSANDRA-8548
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c5ccdb76
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c5ccdb76
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c5ccdb76
Branch: refs/heads/trunk
Commit: c5ccdb7665bf16fc18f336e3967e15ac9266832d
Parents: 9e5a4fa
Author: Marcus Eriksson <ma...@apache.org>
Authored: Thu Jan 8 15:43:31 2015 +0100
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Wed Jan 14 09:49:36 2015 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../apache/cassandra/db/compaction/CompactionManager.java | 10 ++++++++--
2 files changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c5ccdb76/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 9b20a06..a711790 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.0.12:
+ * Make sure we unmark compacting after scrub/cleanup etc (CASSANDRA-8548)
* Check for available disk space before starting a compaction (CASSANDRA-8562)
* Fix DISTINCT queries with LIMITs or paging when some partitions
contain only tombstones (CASSANDRA-8490)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c5ccdb76/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
index 19dedb0..62599e3 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
@@ -220,8 +220,14 @@ public class CompactionManager implements CompactionManagerMBean
{
public Object call() throws IOException
{
- operation.perform(cfs, sstables);
- cfs.getDataTracker().unmarkCompacting(sstables);
+ try
+ {
+ operation.perform(cfs, sstables);
+ }
+ finally
+ {
+ cfs.getDataTracker().unmarkCompacting(sstables);
+ }
return this;
}
};
[3/3] cassandra git commit: Merge branch 'cassandra-2.1' into trunk
Posted by ma...@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/f01b3194
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f01b3194
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f01b3194
Branch: refs/heads/trunk
Commit: f01b3194e815cb833e76fc878288a41b016b2d36
Parents: b8dd3bd 739f9ce
Author: Marcus Eriksson <ma...@apache.org>
Authored: Wed Jan 14 09:50:22 2015 +0100
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Wed Jan 14 09:50:22 2015 +0100
----------------------------------------------------------------------
----------------------------------------------------------------------
[2/3] cassandra git commit: Merge branch 'cassandra-2.0' into
cassandra-2.1
Posted by ma...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/739f9ce3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/739f9ce3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/739f9ce3
Branch: refs/heads/trunk
Commit: 739f9ce380917be5c1a839d132903479c4c7aa0c
Parents: 7e6d9eb c5ccdb7
Author: Marcus Eriksson <ma...@apache.org>
Authored: Wed Jan 14 09:50:12 2015 +0100
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Wed Jan 14 09:50:12 2015 +0100
----------------------------------------------------------------------
----------------------------------------------------------------------