You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2013/06/27 18:37:16 UTC
git commit: Stop compactions before butchering DataTracker in tests
Updated Branches:
refs/heads/trunk 93a03feac -> 39355875f
Stop compactions before butchering DataTracker in tests
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/39355875
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/39355875
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/39355875
Branch: refs/heads/trunk
Commit: 39355875f383f733850c1203512042ebdc93be15
Parents: 93a03fe
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Thu Jun 27 18:37:05 2013 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Thu Jun 27 18:37:05 2013 +0200
----------------------------------------------------------------------
.../org/apache/cassandra/db/ColumnFamilyStore.java | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/39355875/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index 62a1fdb..c643e2b 100644
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@ -1852,8 +1852,17 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
*/
public void clearUnsafe()
{
- for (ColumnFamilyStore cfs : concatWithIndexes())
- cfs.data.init();
+ for (final ColumnFamilyStore cfs : concatWithIndexes())
+ {
+ cfs.runWithCompactionsDisabled(new Callable<Void>()
+ {
+ public Void call()
+ {
+ cfs.data.init();
+ return null;
+ }
+ }, true);
+ }
}
/**