SPY-160: Queue retry op instead of redistributing it immediately.

Motivation ---------- After making the original SPY-160 changes, the ops were correctly redistributed, but if the latch never gets counted down it gets recursively distributed and added. Example: at net.spy.memcached.protocol.TCPMemcachedNodeImpl.addOp(TCPMemcachedNodeImpl.java:344) at net.spy.memcached.MemcachedConnection.addOperation(MemcachedConnection.java:1206) at net.spy.memcached.MemcachedConnection.redistributeOperation(MemcachedConnection.java:994) at net.spy.memcached.protocol.TCPMemcachedNodeImpl.addOp(TCPMemcachedNodeImpl.java:350) at net.spy.memcached.MemcachedConnection.addOperation(MemcachedConnection.java:1206) at net.spy.memcached.MemcachedConnection.redistributeOperation(MemcachedConnection.java:994) at net.spy.memcached.protocol.TCPMemcachedNodeImpl.addOp(TCPMemcachedNodeImpl.java:350) at net.spy.memcached.MemcachedConnection.addOperation(MemcachedConnection.java:1206) at net.spy.memcached.MemcachedConnection.redistributeOperation(MemcachedConnection.java:994) Modifications ------------- The changeset, instead of redistributing right now, adds the operation to the retry queue which means it will be handled eventually, but gives the IO thread a chance to run other tasks (including retreiving auth response information). Result ------ The operation is queued and is not blocking the IO thread. Change-Id: I73a8e77255a54bceeb929febcadb0e555febdd67 Reviewed-on: http://review.couchbase.org/34938 Tested-by: Michael Nitschinger <[email protected]> Reviewed-by: Matt Ingenthron <[email protected]>
couchbase · Mar 27, 2014 · 3ba49ca · 3ba49ca
1 parent 73cd03e
commit 3ba49ca
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/main/java/net/spy/memcached/MemcachedConnection.java b/src/main/java/net/spy/memcached/MemcachedConnection.java
@@ -1418,4 +1418,14 @@ private void logRunException(final Exception e) {
   public boolean isShutDown() {
     return shutDown;
   }
+
+  /**
+   * Add a operation to the retry queue.
+   *
+   * @param op the operation to retry.
+   */
+  public void retryOperation(Operation op) {
+    retryOps.add(op);
+  }
+
 }
diff --git a/src/main/java/net/spy/memcached/protocol/TCPMemcachedNodeImpl.java b/src/main/java/net/spy/memcached/protocol/TCPMemcachedNodeImpl.java
@@ -347,7 +347,7 @@ public final void addOp(Operation op) {
           getLogger().debug("Redistributing Operation " + op + " because auth "
             + "latch taken longer than " + authWaitTime + " milliseconds to "
             + "complete on node " + getSocketAddress());
-          connection.redistributeOperation(op);
+          connection.retryOperation(op);
         } else {
           op.cancel();
           getLogger().warn("Operation canceled because authentication "