Repository: cassandra Updated Branches: refs/heads/cassandra-2.0 4b43684ac -> b24bd0861
Flush system.IndexInfo after marking index built patch by Sam Tunnicliffe; reviewed by Aleksey Yeschenko for CASSANDRA-9128 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b24bd086 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b24bd086 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b24bd086 Branch: refs/heads/cassandra-2.0 Commit: b24bd08616ed4b0395af5d96f27f378202bef0ee Parents: 4b43684 Author: Sam Tunnicliffe <[email protected]> Authored: Tue Apr 7 17:20:00 2015 +0100 Committer: Aleksey Yeschenko <[email protected]> Committed: Wed Apr 8 23:25:34 2015 +0300 ---------------------------------------------------------------------- CHANGES.txt | 3 ++- src/java/org/apache/cassandra/db/SystemKeyspace.java | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b24bd086/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index d52aac7..772afd6 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,5 +1,6 @@ 2.0.15: - * Fix updates to min/max_compaction_threshold throuch cassandra-cli + * Flush system.IndexInfo after marking index built (CASSANDRA-9128) + * Fix updates to min/max_compaction_threshold through cassandra-cli (CASSANDRA-8102) * Backport CASSANDRA-6863 without digest updates (CASSANDRA-8989) * Don't include tmp files when doing offline relevel (CASSANDRA-9088) http://git-wip-us.apache.org/repos/asf/cassandra/blob/b24bd086/src/java/org/apache/cassandra/db/SystemKeyspace.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/SystemKeyspace.java b/src/java/org/apache/cassandra/db/SystemKeyspace.java index 64a487c..5b28ea6 100644 --- a/src/java/org/apache/cassandra/db/SystemKeyspace.java +++ b/src/java/org/apache/cassandra/db/SystemKeyspace.java @@ -662,6 +662,7 @@ public class SystemKeyspace cf.addColumn(new Column(ByteBufferUtil.bytes(indexName), ByteBufferUtil.EMPTY_BYTE_BUFFER, FBUtilities.timestampMicros())); RowMutation rm = new RowMutation(Keyspace.SYSTEM_KS, ByteBufferUtil.bytes(keyspaceName), cf); rm.apply(); + forceBlockingFlush(INDEX_CF); } public static void setIndexRemoved(String keyspaceName, String indexName)
