Discovery: UnicastZenPing don't rename configure host name

elastic#7719 introduced temporary node ids for nodes that can't be resolved via their address. The change is overly aggressive and creates temporary nodes also for the configure target hosts. Closes elastic#7747
mute · Sep 16, 2014 · 2c74020 · 2c74020
1 parent 54a4b90
commit 2c74020
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/src/main/java/org/elasticsearch/discovery/zen/ping/unicast/UnicastZenPing.java b/src/main/java/org/elasticsearch/discovery/zen/ping/unicast/UnicastZenPing.java
@@ -316,12 +316,14 @@ void sendPings(final TimeValue timeout, @Nullable TimeValue waitTime, final Send
                 // to make sure we don't disconnect a true node which was temporarily removed from the DiscoveryNodes
                 // but will be added again during the pinging. We therefore create a new temporary node
                 if (!nodeFoundByAddress) {
-                    DiscoveryNode tempNode = new DiscoveryNode("",
-                            UNICAST_NODE_PREFIX + unicastNodeIdGenerator.incrementAndGet() + "_" + nodeToSend.id(),
-                            nodeToSend.getHostName(), nodeToSend.getHostAddress(), nodeToSend.address(), nodeToSend.attributes(), nodeToSend.version()
-                    );
-                    logger.trace("replacing {} with temp node {}", nodeToSend, tempNode);
-                    nodeToSend = tempNode;
+                    if (!nodeToSend.id().startsWith(UNICAST_NODE_PREFIX)) {
+                        DiscoveryNode tempNode = new DiscoveryNode("",
+                                UNICAST_NODE_PREFIX + unicastNodeIdGenerator.incrementAndGet() + "_" + nodeToSend.id() + "#",
+                                nodeToSend.getHostName(), nodeToSend.getHostAddress(), nodeToSend.address(), nodeToSend.attributes(), nodeToSend.version()
+                        );
+                        logger.trace("replacing {} with temp node {}", nodeToSend, tempNode);
+                        nodeToSend = tempNode;
+                    }
                     sendPingsHandler.nodeToDisconnect.add(nodeToSend);
                 }
                 // fork the connection to another thread