You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2013/12/28 18:57:06 UTC
git commit: shutdown() the compaction strategy in CFS.invalidate()
Updated Branches:
refs/heads/cassandra-1.2 ecbf0fd6f -> 8a51a72ff
shutdown() the compaction strategy in CFS.invalidate()
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8a51a72f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8a51a72f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8a51a72f
Branch: refs/heads/cassandra-1.2
Commit: 8a51a72ff0c014ae41bb36a51268ddf91cc71b85
Parents: ecbf0fd
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Sat Dec 28 20:56:50 2013 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Sat Dec 28 20:56:50 2013 +0300
----------------------------------------------------------------------
.../apache/cassandra/db/ColumnFamilyStore.java | 23 ++++++++++----------
1 file changed, 12 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8a51a72f/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 eaadbdd..3841397 100644
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@ -289,26 +289,27 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
/** call when dropping or renaming a CF. Performs mbean housekeeping and invalidates CFS to other operations */
public void invalidate()
{
+ valid = false;
+
try
{
- valid = false;
unregisterMBean();
-
- SystemTable.removeTruncationRecord(metadata.cfId);
- data.unreferenceSSTables();
- indexManager.invalidate();
-
- for (RowCacheKey key : CacheService.instance.rowCache.getKeySet())
- {
- if (key.cfId == metadata.cfId)
- invalidateCachedRow(key);
- }
}
catch (Exception e)
{
// this shouldn't block anything.
logger.warn("Failed unregistering mbean: " + mbeanName, e);
}
+
+ compactionStrategy.shutdown();
+
+ SystemTable.removeTruncationRecord(metadata.cfId);
+ data.unreferenceSSTables();
+ indexManager.invalidate();
+
+ for (RowCacheKey key : CacheService.instance.rowCache.getKeySet())
+ if (key.cfId == metadata.cfId)
+ invalidateCachedRow(key);
}
/**