Author: slebresne
Date: Fri Dec 2 10:39:31 2011
New Revision: 1209390
URL: http://svn.apache.org/viewvc?rev=1209390&view=rev
Log:
always remove endpoints from delevery queue in HH
patch by slebresne; reviewed by jbellis for CASSANDRA-3546
Modified:
cassandra/branches/cassandra-1.0/CHANGES.txt
cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/HintedHandOffManager.java
Modified: cassandra/branches/cassandra-1.0/CHANGES.txt
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/CHANGES.txt?rev=1209390&r1=1209389&r2=1209390&view=diff
==============================================================================
--- cassandra/branches/cassandra-1.0/CHANGES.txt (original)
+++ cassandra/branches/cassandra-1.0/CHANGES.txt Fri Dec 2 10:39:31 2011
@@ -5,6 +5,7 @@
* Support TimeUUIDType column names in Stress.java tool (CASSANDRA-3541)
* (CQL) INSERT/UPDATE/DELETE/TRUNCATE commands should allow CF names to
be qualified by keyspace (CASSANDRA-3419)
+ * always remove endpoints from delevery queue in HH (CASSANDRA-3546)
1.0.5
Modified:
cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/HintedHandOffManager.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/HintedHandOffManager.java?rev=1209390&r1=1209389&r2=1209390&view=diff
==============================================================================
---
cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/HintedHandOffManager.java
(original)
+++
cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/HintedHandOffManager.java
Fri Dec 2 10:39:31 2011
@@ -230,11 +230,11 @@ public class HintedHandOffManager implem
private void deliverHintsToEndpoint(InetAddress endpoint) throws
IOException, DigestMismatchException, InvalidRequestException,
TimeoutException, InterruptedException
{
ColumnFamilyStore hintStore =
Table.open(Table.SYSTEM_TABLE).getColumnFamilyStore(HINTS_CF);
- if (hintStore.isEmpty())
- return; // nothing to do, don't confuse users by logging a no-op
handoff
-
try
{
+ if (hintStore.isEmpty())
+ return; // nothing to do, don't confuse users by logging a
no-op handoff
+
logger_.debug("Checking remote({}) schema before delivering
hints", endpoint);
int waited = waitForSchemaAgreement(endpoint);
// sleep a random amount to stagger handoff delivery from
different replicas.
