svn commit: r1175880 - in /cassandra/branches/cassandra-0.8: CHANGES.txt src/java/org/apache/cassandra/service/AntiEntropyService.java

[sl...@apache.org]

Author: slebresne
Date: Mon Sep 26 14:18:14 2011
New Revision: 1175880

URL: http://svn.apache.org/viewvc?rev=1175880&view=rev
Log:
Log a miningfull warning when a node receive a message for a repair session that don't exist anymore
patch by slebresne; reviewed by jbellis for CASSANDRA-3256

Modified:
    cassandra/branches/cassandra-0.8/CHANGES.txt
    cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/service/AntiEntropyService.java

Modified: cassandra/branches/cassandra-0.8/CHANGES.txt
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/CHANGES.txt?rev=1175880&r1=1175879&r2=1175880&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.8/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.8/CHANGES.txt Mon Sep 26 14:18:14 2011
@@ -5,6 +5,8 @@
  * Don't allow any cache loading exceptions to halt startup (CASSANDRA-3218)
  * Fix sstableloader --ignores option (CASSANDRA-3247)
  * File descriptor limit increased in packaging (CASSANDRA-3206)
+ * Log a miningfull warning when a node receive a message for a repair session
+   that don't exist anymore (CASSANDRA-3256)
 
 
 0.8.6

Modified: cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/service/AntiEntropyService.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/service/AntiEntropyService.java?rev=1175880&r1=1175879&r2=1175880&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/service/AntiEntropyService.java (original)
+++ cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/service/AntiEntropyService.java Mon Sep 26 14:18:14 2011
@@ -167,7 +167,11 @@ public class AntiEntropyService
     private void rendezvous(TreeRequest request, MerkleTree tree)
     {
         RepairSession session = sessions.get(request.sessionid);
-        assert session != null;
+        if (session == null)
+        {
+            logger.warn("Got a merkle tree response for unknown repair session {}: either this node has been restarted since the session was started, or the session has been interrupted for an unknown reason. ", request.sessionid);
+            return;
+        }
 
         RepairSession.RepairJob job = session.jobs.peek();
         assert job != null : "A repair should have at least some jobs scheduled";