From c1f125b9b61a1aafb65c0466a43ceddbf9e8e9f9 Mon Sep 17 00:00:00 2001 From: Sylvain Lebresne Date: Thu, 12 Jan 2012 09:11:25 +0100 Subject: [PATCH 1/3] Have isIndexBuilt expunge all tombstones --- src/java/org/apache/cassandra/db/SystemTable.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/java/org/apache/cassandra/db/SystemTable.java b/src/java/org/apache/cassandra/db/SystemTable.java index 19e9f15f2b..8f1adfc91c 100644 --- a/src/java/org/apache/cassandra/db/SystemTable.java +++ b/src/java/org/apache/cassandra/db/SystemTable.java @@ -382,7 +382,7 @@ public class SystemTable QueryFilter filter = QueryFilter.getNamesFilter(decorate(ByteBufferUtil.bytes(table)), new QueryPath(INDEX_CF), ByteBufferUtil.bytes(indexName)); - return cfs.getColumnFamily(filter) != null; + return ColumnFamilyStore.removeDeleted(cfs.getColumnFamily(filter), Integer.MAX_VALUE) != null; } public static void setIndexBuilt(String table, String indexName) From d7e40a1cdd3394ea5f5178e1b01ff693a0f173c2 Mon Sep 17 00:00:00 2001 From: Sylvain Lebresne Date: Thu, 12 Jan 2012 10:30:25 +0100 Subject: [PATCH 2/3] Fix mistake in NEWS file --- NEWS.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/NEWS.txt b/NEWS.txt index 2356faad6f..2c29606c9f 100644 --- a/NEWS.txt +++ b/NEWS.txt @@ -15,6 +15,13 @@ Upgrading --------- - Nothing specific to 1.0.7, please report to instruction for 1.0.6 +Other +----- + - Adds new setstreamthroughput to nodetool to configure streaming + throttling + - Adds JMX property to get/set rpc_timeout_in_ms at runtime + - Allow configuring (per-CF) bloom_filter_fp_chance + 1.0.6 ===== @@ -29,13 +36,6 @@ Upgrading setting the right value and then run scrub on the column family. - Please report to instruction for 1.0.5 if coming from an older version. -Other ------ - - Adds new setstreamthroughput to nodetool to configure streaming - throttling - - Adds JMX property to get/set rpc_timeout_in_ms at runtime - - Allow configuring (per-CF) bloom_filter_fp_chance - 1.0.5 ===== From cafeeebd17b208e12313bea9da0972e6f4c5cdf8 Mon Sep 17 00:00:00 2001 From: Brandon Williams Date: Thu, 12 Jan 2012 10:54:22 -0600 Subject: [PATCH 3/3] Block on flush before submitting compaction for hints. Patch by brandonwilliams, reviewed by jbellis for CASSANDRA-3733 --- src/java/org/apache/cassandra/db/HintedHandOffManager.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/java/org/apache/cassandra/db/HintedHandOffManager.java b/src/java/org/apache/cassandra/db/HintedHandOffManager.java index 0b92821797..a83fbabd88 100644 --- a/src/java/org/apache/cassandra/db/HintedHandOffManager.java +++ b/src/java/org/apache/cassandra/db/HintedHandOffManager.java @@ -179,7 +179,7 @@ public class HintedHandOffManager implements HintedHandOffManagerMBean { logger_.info("Deleting any stored hints for " + endpoint); rm.apply(); - hintStore.forceFlush(); + hintStore.forceBlockingFlush(); CompactionManager.instance.submitMaximal(hintStore, Integer.MAX_VALUE); } catch (Exception e) @@ -359,9 +359,9 @@ public class HintedHandOffManager implements HintedHandOffManagerMBean if (rowsReplayed > 0) { - hintStore.forceFlush(); try { + hintStore.forceBlockingFlush(); CompactionManager.instance.submitMaximal(hintStore, Integer.MAX_VALUE).get(); } catch (Exception e)