Updated Branches:
refs/heads/trunk 7fab776f0 -> 876d313f4
Merge branch 'cassandra-1.2' into trunk
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/876d313f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/876d313f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/876d313f
Branch: refs/heads/trunk
Commit: 876d313f4ea656c4502495ca702f5c22c567d329
Parents: 7fab776 86063aa
Author: Sylvain Lebresne <sylv...@datastax.com>
Authored: Fri Feb 15 23:10:32 2013 +0100
Committer: Sylvain Lebresne <sylv...@datastax.com>
Committed: Fri Feb 15 23:10:32 2013 +0100
----------------------------------------------------------------------
CHANGES.txt | 2 +-
.../org/apache/cassandra/db/ColumnFamilyStore.java | 13 +++++++++++--
2 files changed, 12 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/876d313f/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/876d313f/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index 7afaf96,c08224e..6bee607
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@@ -775,8 -689,17 +775,17 @@@ public class ColumnFamilyStore implemen
if (clean)
{
- logger.debug("forceFlush requested but everything is clean in
{}", name);
- return Futures.immediateCheckedFuture(null);
+ // We could have a memtable for this column family that is being
+ // flushed. Make sure the future returned wait for that so
callers can
+ // assume that any data inserted prior to the call are fully
flushed
+ // when the future returns (see #5241).
+ return postFlushExecutor.submit(new Runnable()
+ {
+ public void run()
+ {
- logger.debug("forceFlush requested but everything is
clean in {}", columnFamily);
++ logger.debug("forceFlush requested but everything is
clean in {}", name);
+ }
+ });
}
return switchMemtable(true, false);
