You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2012/01/12 18:02:36 UTC
git commit: Block on flush before submitting compaction for hints.
Patch by brandonwilliams, reviewed by jbellis for CASSANDRA-3733
Updated Branches:
refs/heads/cassandra-1.0 d7e40a1cd -> cafeeebd1
Block on flush before submitting compaction for hints.
Patch by brandonwilliams, reviewed by jbellis for CASSANDRA-3733
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cafeeebd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cafeeebd
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cafeeebd
Branch: refs/heads/cassandra-1.0
Commit: cafeeebd17b208e12313bea9da0972e6f4c5cdf8
Parents: d7e40a1
Author: Brandon Williams <br...@apache.org>
Authored: Thu Jan 12 10:54:22 2012 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Jan 12 10:54:22 2012 -0600
----------------------------------------------------------------------
.../apache/cassandra/db/HintedHandOffManager.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cafeeebd/src/java/org/apache/cassandra/db/HintedHandOffManager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/HintedHandOffManager.java b/src/java/org/apache/cassandra/db/HintedHandOffManager.java
index 0b92821..a83fbab 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)