svn commit: r1001531 - in /cassandra/trunk: CHANGES.txt src/java/org/apache/cassandra/service/AntiEntropyService.java src/java/org/apache/cassandra/service/StorageService.java

[jbellis]

Author: jbellis
Date: Sun Sep 26 21:53:44 2010
New Revision: 1001531

URL: http://svn.apache.org/viewvc?rev=1001531&view=rev
Log:
Execute TREE_RESPONSE verbs in the proper stage: fixes potential races in 
AES.rendezvous
patch by Stu Hood; reviewed by jbellis for CASSANDRA-1511

Modified:
    cassandra/trunk/CHANGES.txt
    
cassandra/trunk/src/java/org/apache/cassandra/service/AntiEntropyService.java
    cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java

Modified: cassandra/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/cassandra/trunk/CHANGES.txt?rev=1001531&r1=1001530&r2=1001531&view=diff
==============================================================================
--- cassandra/trunk/CHANGES.txt (original)
+++ cassandra/trunk/CHANGES.txt Sun Sep 26 21:53:44 2010
@@ -93,6 +93,7 @@
  * MD5 authenticator compares plain text submitted password with MD5'd
    saved property, instead of vice versa (CASSANDRA-1447)
  * JMX MessagingService pending and completed counts (CASSANDRA-1533)
+ * fix race condition processing repair responses (CASSANDRA-1511)
 
 
 0.7-beta1

Modified: 
cassandra/trunk/src/java/org/apache/cassandra/service/AntiEntropyService.java
URL: 
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/service/AntiEntropyService.java?rev=1001531&r1=1001530&r2=1001531&view=diff
==============================================================================
--- 
cassandra/trunk/src/java/org/apache/cassandra/service/AntiEntropyService.java 
(original)
+++ 
cassandra/trunk/src/java/org/apache/cassandra/service/AntiEntropyService.java 
Sun Sep 26 21:53:44 2010
@@ -255,15 +255,6 @@ public class AntiEntropyService
     }
 
     /**
-     * @return The tree pair for the given request if it exists.
-     */
-    TreePair getRendezvousPair_TestsOnly(TreeRequest request)
-    {
-        System.out.println(request + "\tvs\t" + 
rendezvousPairs(request.sessionid).keySet());
-        return rendezvousPairs(request.sessionid).get(request);
-    }
-
-    /**
      * A Strategy to handle building and validating a merkle tree for a column 
family.
      *
      * Lifecycle:

Modified: 
cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java
URL: 
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java?rev=1001531&r1=1001530&r2=1001531&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java 
(original)
+++ cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java 
Sun Sep 26 21:53:44 2010
@@ -119,7 +119,7 @@ public class StorageService implements I
         put(Verb.RANGE_SLICE, Stage.READ);
         put(Verb.BOOTSTRAP_TOKEN, Stage.MISC);
         put(Verb.TREE_REQUEST, Stage.AE_SERVICE);
-        put(Verb.TREE_RESPONSE, Stage.RESPONSE);
+        put(Verb.TREE_RESPONSE, Stage.AE_SERVICE);
         put(Verb.GOSSIP_DIGEST_ACK, Stage.GOSSIP);
         put(Verb.GOSSIP_DIGEST_ACK2, Stage.GOSSIP);
         put(Verb.GOSSIP_DIGEST_SYN, Stage.GOSSIP);