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 2013/02/11 20:05:58 UTC
[1/6] git commit: Always collect hint tombstones. Patch by
brandonwilliams, reviewed by slebresne for CASSANDRA-5068
Always collect hint tombstones.
Patch by brandonwilliams, reviewed by slebresne for CASSANDRA-5068
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/577cb2c7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/577cb2c7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/577cb2c7
Branch: refs/heads/cassandra-1.1
Commit: 577cb2c7600c6e26f5a2a252cb157769e861ece9
Parents: 310bf34
Author: Brandon Williams <br...@apache.org>
Authored: Mon Feb 11 13:03:19 2013 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Feb 11 13:05:00 2013 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../apache/cassandra/db/HintedHandOffManager.java | 15 ++++++---------
2 files changed, 7 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/577cb2c7/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index f296d92..0c76bd0 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -5,6 +5,7 @@
* fix start key/end token validation for wide row iteration (CASSANDRA-5168)
* add ConfigHelper support for Thrift frame and max message sizes (CASSANDRA-5188)
* fix nodetool repair not fail on node down (CASSANDRA-5203)
+ * always collect tombstone hints (CASSANDRA-5068)
1.1.9
http://git-wip-us.apache.org/repos/asf/cassandra/blob/577cb2c7/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 12a2814..eea4ec4 100644
--- a/src/java/org/apache/cassandra/db/HintedHandOffManager.java
+++ b/src/java/org/apache/cassandra/db/HintedHandOffManager.java
@@ -377,16 +377,13 @@ public class HintedHandOffManager implements HintedHandOffManagerMBean
}
}
- if (rowsReplayed > 0)
+ try
{
- try
- {
- compact().get();
- }
- catch (Exception e)
- {
- throw new RuntimeException(e);
- }
+ compact().get();
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException(e);
}
logger_.info(String.format("Finished hinted handoff of %s rows to endpoint %s", rowsReplayed, endpoint));