Merge pull request #322 from sUpniverse/supniverse/cancel_message

ENHANCE: add node information to the cancellation message
naver · Jan 29, 2021 · 1c77f7d · 1c77f7d
2 parents ded452c + 247f141
commit 1c77f7d
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 5 deletions.
diff --git a/src/main/java/net/spy/memcached/MemcachedConnection.java b/src/main/java/net/spy/memcached/MemcachedConnection.java
@@ -294,8 +294,8 @@ private void updateConnections(List<InetSocketAddress> addrs) throws IOException
     List<MemcachedNode> removeNodes = new ArrayList<MemcachedNode>();
 
     for (MemcachedNode node : locator.getAll()) {
-      if (addrs.contains((InetSocketAddress) node.getSocketAddress())) {
-        addrs.remove((InetSocketAddress) node.getSocketAddress());
+      if (addrs.contains(node.getSocketAddress())) {
+        addrs.remove(node.getSocketAddress());
       } else {
         removeNodes.add(node);
       }
@@ -749,7 +749,7 @@ private void handleIO(SelectionKey sk) {
 
       qa.setupForAuth("due to exception"); // noop if !shouldAuth
       getLogger().warn("Reconnecting due to exception on %s", qa, e);
-      lostConnection(qa, ReconnDelay.DEFAULT, "exception" + e);
+      lostConnection(qa, ReconnDelay.DEFAULT, e.getMessage());
     }
     qa.fixupOps();
   }

diff --git a/src/main/java/net/spy/memcached/MemcachedNode.java b/src/main/java/net/spy/memcached/MemcachedNode.java
@@ -130,6 +130,11 @@ public interface MemcachedNode {
    */
   int getSelectionOps();
 
+  /**
+   * Get the node name used for reading ip, port and hostname from this node
+   */
+  String getNodeName();
+
   /**
    * Get the buffer used for reading data from this node.
    */

diff --git a/src/main/java/net/spy/memcached/MemcachedNodeROImpl.java b/src/main/java/net/spy/memcached/MemcachedNodeROImpl.java
@@ -43,6 +43,11 @@ public String toString() {
     return root.toString();
   }
 
+  @Override
+  public String getNodeName() {
+    return root.getNodeName();
+  }
+
   public MemcachedNode getMemcachedNode() {
     return root;
   }

diff --git a/src/main/java/net/spy/memcached/protocol/BaseOperationImpl.java b/src/main/java/net/spy/memcached/protocol/BaseOperationImpl.java
@@ -86,7 +86,11 @@ public final OperationException getException() {
 
   public final void cancel(String cause) {
     cancelled = true;
-    cancelCause = "Cancelled (" + cause + ")";
+    if (handlingNode != null) {
+      cancelCause = "Cancelled (" + cause + " : (" + handlingNode.getNodeName() + ")" + ")";
+    } else {
+      cancelCause = "Cancelled (" + cause + ")";
+    }
     wasCancelled();
     callback.complete();
   }

diff --git a/src/main/java/net/spy/memcached/protocol/TCPMemcachedNodeImpl.java b/src/main/java/net/spy/memcached/protocol/TCPMemcachedNodeImpl.java
@@ -400,6 +400,10 @@ public final int getSelectionOps() {
     return rv;
   }
 
+  public final String getNodeName() {
+    return nodeName;
+  }
+
   public final ByteBuffer getRbuf() {
     return rbuf;
   }

diff --git a/src/test/java/net/spy/memcached/MemcachedNodeROImplTest.java b/src/test/java/net/spy/memcached/MemcachedNodeROImplTest.java
@@ -28,7 +28,7 @@ public void testReadOnliness() throws Exception {
 
     Set<String> acceptable = new HashSet<String>(Arrays.asList(
             "toString", "getSocketAddress", "getBytesRemainingToWrite",
-            "getReconnectCount", "getSelectionOps", "hasReadOp",
+            "getReconnectCount", "getSelectionOps", "getNodeName", "hasReadOp",
             "hasWriteOp", "isActive", "isFirstConnecting"));
 
     for (Method meth : MemcachedNode.class.getMethods()) {

diff --git a/src/test/java/net/spy/memcached/MockMemcachedNode.java b/src/test/java/net/spy/memcached/MockMemcachedNode.java
@@ -118,6 +118,11 @@ public int getSelectionOps() {
     return 0;
   }
 
+  @Override
+  public String getNodeName() {
+    return null;
+  }
+
   public ByteBuffer getRbuf() {
     return null;
   }