From 9735d3e6d7c453f0904220005c715354856403be Mon Sep 17 00:00:00 2001
From: kimchy <kimchy@gmail.com>
Date: Mon, 24 Jan 2011 13:34:43 +0200
Subject: [PATCH] don't establish a connection between two client nodes

---
 .../cluster/service/InternalClusterService.java   | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/service/InternalClusterService.java b/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/service/InternalClusterService.java
index 64c8fac2b83..d0f25cfee7c 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/service/InternalClusterService.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/service/InternalClusterService.java
@@ -223,6 +223,9 @@ public class InternalClusterService extends AbstractLifecycleComponent<ClusterSe
 
                     // TODO, do this in parallel (and wait)
                     for (DiscoveryNode node : nodesDelta.addedNodes()) {
+                        if (!nodeRequiresConnection(node)) {
+                            continue;
+                        }
                         try {
                             transportService.connectToNode(node);
                         } catch (Exception e) {
@@ -292,6 +295,9 @@ public class InternalClusterService extends AbstractLifecycleComponent<ClusterSe
                 if (lifecycle.stoppedOrClosed()) {
                     return;
                 }
+                if (!nodeRequiresConnection(node)) {
+                    continue;
+                }
                 if (clusterState.nodes().nodeExists(node.id())) { // we double check existence of node since connectToNode might take time...
                     if (!transportService.nodeConnected(node)) {
                         try {
@@ -309,4 +315,13 @@ public class InternalClusterService extends AbstractLifecycleComponent<ClusterSe
             }
         }
     }
+
+    private boolean nodeRequiresConnection(DiscoveryNode node) {
+        if (localNode().clientNode()) {
+            if (node.clientNode()) {
+                return false;
+            }
+        }
+        return true;
+    }
 }
\ No newline at end of file