cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [8/8] git commit: Block on flush before submitting compaction for hints. Patch by brandonwilliams, reviewed by jbellis for CASSANDRA-3733
Date Wed, 01 Feb 2012 19:12:53 GMT
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/aacbb1ca
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/aacbb1ca
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/aacbb1ca

Branch: refs/heads/cassandra-1.0
Commit: aacbb1ca9c0e7a1992dfc92c096dd885ab149154
Parents: 70a350e
Author: Brandon Williams <brandonwilliams@apache.org>
Authored: Thu Jan 12 10:54:22 2012 -0600
Committer: Brandon Williams <brandonwilliams@apache.org>
Committed: Thu Jan 12 11:08:50 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/aacbb1ca/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 1f9c7d2..f038aed 100644
--- a/src/java/org/apache/cassandra/db/HintedHandOffManager.java
+++ b/src/java/org/apache/cassandra/db/HintedHandOffManager.java
@@ -225,7 +225,7 @@ public class HintedHandOffManager implements HintedHandOffManagerMBean
                 {
                     logger_.info("Deleting any stored hints for " + ipaddr);
                     rm.apply();
-                    hintStore.forceFlush();
+                    hintStore.forceBlockingFlush();
                     CompactionManager.instance.submitMajor(hintStore, 0, Integer.MAX_VALUE);
                 }
                 catch (Exception e)
@@ -365,9 +365,9 @@ public class HintedHandOffManager implements HintedHandOffManagerMBean
 
         if (rowsReplayed > 0)
         {
-            hintStore.forceFlush();
             try
             {
+                hintStore.forceBlockingFlush();
                 CompactionManager.instance.submitMajor(hintStore, 0, Integer.MAX_VALUE).get();
             }
             catch (Exception e)


Mime
View raw message