Java client nodes using multicast discovery connect to one another, c…

…loses elastic#1135.
mute · Jul 20, 2011 · 0b0053c · 0b0053c
1 parent 60bf324
commit 0b0053c
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 7 deletions.
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/node/DiscoveryNode.java b/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/node/DiscoveryNode.java
@@ -97,6 +97,16 @@ public DiscoveryNode(String nodeName, String nodeId, TransportAddress address, M
         this.address = address;
     }
 
+    /**
+     * Should this node form a connection to the provided node.
+     */
+    public boolean shouldConnectTo(DiscoveryNode otherNode) {
+        if (clientNode() && otherNode.clientNode()) {
+            return false;
+        }
+        return true;
+    }
+
     /**
      * The address that the node can be communicated with.
      */

diff --git a/...elasticsearch/src/main/java/org/elasticsearch/cluster/service/InternalClusterService.java b/...elasticsearch/src/main/java/org/elasticsearch/cluster/service/InternalClusterService.java
@@ -341,11 +341,6 @@ private class ReconnectToNodes implements Runnable {
     }
 
     private boolean nodeRequiresConnection(DiscoveryNode node) {
-        if (localNode().clientNode()) {
-            if (node.clientNode()) {
-                return false;
-            }
-        }
-        return true;
+        return localNode().shouldConnectTo(node);
     }
 }
diff --git a/...search/src/main/java/org/elasticsearch/discovery/zen/ping/multicast/MulticastZenPing.java b/...search/src/main/java/org/elasticsearch/discovery/zen/ping/multicast/MulticastZenPing.java
@@ -348,7 +348,16 @@ public void stop() {
                         continue;
                     }
                     if (!clusterName.equals(MulticastZenPing.this.clusterName)) {
-                        // not our cluster, ignore it...
+                        if (logger.isTraceEnabled()) {
+                            logger.trace("[{}] received ping_request from [{}], but wrong cluster_name [{}], expected [{}], ignoring", id, requestingNode, clusterName, MulticastZenPing.this.clusterName);
+                        }
+                        continue;
+                    }
+                    // don't connect between two client nodes, no need for that...
+                    if (!discoveryNodes.localNode().shouldConnectTo(requestingNode)) {
+                        if (logger.isTraceEnabled()) {
+                            logger.trace("[{}] received ping_request from [{}], both are client nodes, ignoring", id, requestingNode, clusterName);
+                        }
                         continue;
                     }
                     final MulticastPingResponse multicastPingResponse = new MulticastPingResponse();