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:59:55 UTC
[1/3] git commit: shutdown() the compaction strategy in
CFS.invalidate()
Updated Branches:
refs/heads/trunk 70f7574a4 -> 4642f5ca1
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/trunk
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);
}
/**
[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by al...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Conflicts:
src/java/org/apache/cassandra/db/ColumnFamilyStore.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0e0884f5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0e0884f5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0e0884f5
Branch: refs/heads/trunk
Commit: 0e0884f50338d83de7779d8b5ddd8d66e281586b
Parents: 6a211f4 8a51a72
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Sat Dec 28 20:58:55 2013 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Sat Dec 28 20:58:55 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/0e0884f5/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index a04c9e2,3841397..cbd9d2e
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@@ -340,6 -300,16 +331,16 @@@ public class ColumnFamilyStore implemen
// this shouldn't block anything.
logger.warn("Failed unregistering mbean: " + mbeanName, e);
}
+
+ compactionStrategy.shutdown();
+
- SystemTable.removeTruncationRecord(metadata.cfId);
++ SystemKeyspace.removeTruncationRecord(metadata.cfId);
+ data.unreferenceSSTables();
+ indexManager.invalidate();
+
+ for (RowCacheKey key : CacheService.instance.rowCache.getKeySet())
+ if (key.cfId == metadata.cfId)
+ invalidateCachedRow(key);
}
/**
[3/3] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by al...@apache.org.
Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4642f5ca
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4642f5ca
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4642f5ca
Branch: refs/heads/trunk
Commit: 4642f5ca1e720e9699c3935c596704ef31d675da
Parents: 70f7574 0e0884f
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Sat Dec 28 20:59:28 2013 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Sat Dec 28 20:59:28 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/4642f5ca/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index 6f0308e,cbd9d2e..0bed84b
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@@ -335,8 -329,18 +326,18 @@@ public class ColumnFamilyStore implemen
catch (Exception e)
{
// this shouldn't block anything.
- logger.warn("Failed unregistering mbean: " + mbeanName, e);
+ logger.warn("Failed unregistering mbean: {}", mbeanName, e);
}
+
+ compactionStrategy.shutdown();
+
+ SystemKeyspace.removeTruncationRecord(metadata.cfId);
+ data.unreferenceSSTables();
+ indexManager.invalidate();
+
+ for (RowCacheKey key : CacheService.instance.rowCache.getKeySet())
+ if (key.cfId == metadata.cfId)
+ invalidateCachedRow(key);
}
/**