Add resolve timeout to log message

This commit adds the resolve timeout to the warn log message displayed
when we timeout resolving unicast hosts.

Author: jasontedor

core/src/main/java/org/elasticsearch/discovery/zen/UnicastZenPing.java

@@ -271,7 +271,7 @@ public static List<DiscoveryNode> resolveDiscoveryNodes(
                     logger.warn(message, e);
                 }
             } else {
-                logger.warn("timed out resolving host [{}]", hostname);
+                logger.warn("timed out after [{}] resolving host [{}]", resolveTimeout, hostname);
             }
         }
         return discoveryNodes;

core/src/test/java/org/elasticsearch/discovery/zen/UnicastZenPingTests.java

@@ -474,7 +474,8 @@ public TransportAddress[] addressesFromString(String address, int perAddressLimi
         final TransportService transportService =
             new TransportService(Settings.EMPTY, transport, threadPool, TransportService.NOOP_TRANSPORT_INTERCEPTOR, null);
         closeables.push(transportService);
-            final AtomicInteger idGenerator = new AtomicInteger();
+        final AtomicInteger idGenerator = new AtomicInteger();
+        final TimeValue resolveTimeout = TimeValue.timeValueMillis(randomIntBetween(1, 100));
         try {
             final List<DiscoveryNode> discoveryNodes = UnicastZenPing.resolveDiscoveryNodes(
                 threadPool,
@@ -483,13 +484,13 @@ public TransportAddress[] addressesFromString(String address, int perAddressLimi
                 1,
                 transportService,
                 () -> Integer.toString(idGenerator.incrementAndGet()),
-                TimeValue.timeValueMillis(100));
+                resolveTimeout);
 
             assertThat(discoveryNodes, hasSize(1));
             verify(logger).trace(
                 "resolved host [{}] to {}", "hostname1",
                 new TransportAddress[]{new TransportAddress(TransportAddress.META_ADDRESS, 9300)});
-            verify(logger).warn("timed out resolving host [{}]", "hostname2");
+            verify(logger).warn("timed out after [{}] resolving host [{}]", resolveTimeout, "hostname2");
             verifyNoMoreInteractions(logger);
         } finally {
             latch.countDown();