add trace logging to unicast discovery

Author: kimchy

modules/elasticsearch/src/main/java/org/elasticsearch/discovery/zen/ping/ZenPing.java

@@ -93,9 +93,6 @@ public static PingResponse readPingResponse(StreamInput in) throws IOException {
 
         @Override public void writeTo(StreamOutput out) throws IOException {
             clusterName.writeTo(out);
-            if (target == null) {
-                System.out.println("ARGH!");
-            }
             target.writeTo(out);
             if (master == null) {
                 out.writeBoolean(false);
@@ -106,7 +103,7 @@ public static PingResponse readPingResponse(StreamInput in) throws IOException {
         }
 
         @Override public String toString() {
-            return "ping_response target [" + target + "], master [" + master + "]";
+            return "ping_response{target [" + target + "], master [" + master + "], cluster_name[" + clusterName.value() + "]}";
         }
     }
 }

modules/elasticsearch/src/main/java/org/elasticsearch/discovery/zen/ping/unicast/UnicastZenPing.java

@@ -39,6 +39,7 @@
 import org.elasticsearch.transport.*;
 
 import java.io.IOException;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.Queue;
@@ -158,7 +159,7 @@ public PingResponse[] pingAndWait(TimeValue timeout) {
         }, timeout);
     }
 
-    private void sendPings(int id, TimeValue timeout, boolean wait) {
+    private void sendPings(final int id, TimeValue timeout, boolean wait) {
         UnicastPingRequest pingRequest = new UnicastPingRequest();
         pingRequest.id = id;
         pingRequest.timeout = timeout;
@@ -185,11 +186,13 @@ private void sendPings(int id, TimeValue timeout, boolean wait) {
             try {
                 transportService.connectToNode(nodeToSend);
             } catch (ConnectTransportException e) {
+                logger.trace("[{}] failed to connect to {}", e, id, nodeToSend);
                 latch.countDown();
                 // can't connect to the node
                 continue;
             }
 
+            logger.trace("[{}] connecting to {}, disconnect[{}]", id, nodeToSend, disconnectX);
             final boolean disconnect = disconnectX;
             transportService.sendRequest(nodeToSend, UnicastPingRequestHandler.ACTION, pingRequest, TransportRequestOptions.options().withTimeout((long) (timeout.millis() * 1.25)), new BaseTransportResponseHandler<UnicastPingResponse>() {
 
@@ -198,6 +201,7 @@ private void sendPings(int id, TimeValue timeout, boolean wait) {
                 }
 
                 @Override public void handleResponse(UnicastPingResponse response) {
+                    logger.trace("[{}] received response from {}: {}", id, nodeToSend, Arrays.toString(response.pingResponses));
                     try {
                         DiscoveryNodes discoveryNodes = nodesProvider.nodes();
                         for (PingResponse pingResponse : response.pingResponses) {
@@ -210,6 +214,7 @@ private void sendPings(int id, TimeValue timeout, boolean wait) {
                             }
                             if (!pingResponse.clusterName().equals(clusterName)) {
                                 // not part of the cluster
+                                logger.debug("[{}] filtering out response from {}, not same cluster_name [{}]", pingResponse.target(), pingResponse.clusterName().value());
                                 return;
                             }
                             ConcurrentMap<DiscoveryNode, PingResponse> responses = receivedResponses.get(response.id);
@@ -228,6 +233,7 @@ private void sendPings(int id, TimeValue timeout, boolean wait) {
                     latch.countDown();
                     if (exp instanceof ConnectTransportException) {
                         // ok, not connected...
+                        logger.trace("failed to connect to {}", exp, nodeToSend);
                     } else {
                         if (disconnect) {
                             transportService.disconnectFromNode(nodeToSend);