have loadTokens expunge all tombstones patch by jbellis; reviewed by slebresne for CASSANDRA-3579
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a95eafdc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a95eafdc Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a95eafdc Branch: refs/heads/trunk Commit: a95eafdccd398e775646688e9e37e0ae29e1114a Parents: 185eca5 Author: Jonathan Ellis <jbel...@apache.org> Authored: Wed Jan 11 13:41:59 2012 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Wed Jan 11 13:51:58 2012 -0600 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/SystemTable.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a95eafdc/src/java/org/apache/cassandra/db/SystemTable.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/SystemTable.java b/src/java/org/apache/cassandra/db/SystemTable.java index 93a0d05..19e9f15 100644 --- a/src/java/org/apache/cassandra/db/SystemTable.java +++ b/src/java/org/apache/cassandra/db/SystemTable.java @@ -223,7 +223,7 @@ public class SystemTable IPartitioner p = StorageService.getPartitioner(); Table table = Table.open(Table.SYSTEM_TABLE); QueryFilter filter = QueryFilter.getIdentityFilter(decorate(RING_KEY), new QueryPath(STATUS_CF)); - ColumnFamily cf = table.getColumnFamilyStore(STATUS_CF).getColumnFamily(filter); + ColumnFamily cf = ColumnFamilyStore.removeDeleted(table.getColumnFamilyStore(STATUS_CF).getColumnFamily(filter), Integer.MAX_VALUE); if (cf != null) { for (IColumn column : cf.getSortedColumns())
