Just create the ExecutorService within UnicastConfiguredHostsResolver

Author: DaveCTurner

server/src/main/java/org/elasticsearch/discovery/UnicastConfiguredHostsResolver.java

@@ -25,6 +25,7 @@
 import org.elasticsearch.common.transport.TransportAddress;
 import org.elasticsearch.common.unit.TimeValue;
 import org.elasticsearch.common.util.concurrent.AbstractRunnable;
+import org.elasticsearch.common.util.concurrent.EsExecutors;
 import org.elasticsearch.discovery.PeerFinder.ConfiguredHostsResolver;
 import org.elasticsearch.discovery.zen.UnicastHostsProvider;
 import org.elasticsearch.discovery.zen.UnicastZenPing;
@@ -33,10 +34,12 @@
 
 import java.util.List;
 import java.util.concurrent.ExecutorService;
+import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Consumer;
-import java.util.function.Supplier;
+
+import static org.elasticsearch.discovery.zen.UnicastZenPing.DISCOVERY_ZEN_PING_UNICAST_CONCURRENT_CONNECTS_SETTING;
 
 public class UnicastConfiguredHostsResolver extends AbstractLifecycleComponent implements ConfiguredHostsResolver {
 
@@ -45,20 +48,21 @@ public class UnicastConfiguredHostsResolver extends AbstractLifecycleComponent i
     private final UnicastHostsProvider hostsProvider;
     private final SetOnce<ExecutorService> executorService = new SetOnce<>();
     private final TimeValue resolveTimeout;
-    private final Supplier<ExecutorService> executorServiceFactory;
 
-    public UnicastConfiguredHostsResolver(Settings settings, TransportService transportService, UnicastHostsProvider hostsProvider,
-                                          Supplier<ExecutorService> executorServiceFactory) {
+    public UnicastConfiguredHostsResolver(Settings settings, TransportService transportService, UnicastHostsProvider hostsProvider) {
         super(settings);
         this.transportService = transportService;
         this.hostsProvider = hostsProvider;
         resolveTimeout = UnicastZenPing.DISCOVERY_ZEN_PING_UNICAST_HOSTS_RESOLVE_TIMEOUT.get(settings);
-        this.executorServiceFactory = executorServiceFactory;
     }
 
     @Override
     protected void doStart() {
-        executorService.set(executorServiceFactory.get());
+        final int concurrentConnects = DISCOVERY_ZEN_PING_UNICAST_CONCURRENT_CONNECTS_SETTING.get(settings);
+        logger.debug("using concurrent_connects [{}], resolve_timeout [{}]", concurrentConnects, resolveTimeout);
+        final ThreadFactory threadFactory = EsExecutors.daemonThreadFactory(settings, "[unicast_configured_hosts_resolver]");
+        executorService.set(EsExecutors.newScaling(nodeName() + "/" + "unicast_configured_hosts_resolver",
+            0, concurrentConnects, 60, TimeUnit.SECONDS, threadFactory, transportService.getThreadPool().getThreadContext()));
     }
 
     @Override

server/src/test/java/org/elasticsearch/discovery/UnicastConfiguredHostsResolverTests.java

@@ -56,13 +56,8 @@ public void startResolver() {
         TransportService transportService = mock(TransportService.class);
         when(transportService.getThreadPool()).thenReturn(threadPool);
 
-        unicastConfiguredHostsResolver = new UnicastConfiguredHostsResolver(
-            settings, transportService, hostsResolver -> transportAddresses, () -> {
-            final ThreadFactory threadFactory = EsExecutors.daemonThreadFactory("thread-factory-name");
-            return EsExecutors.newScaling("executor-name",
-                0, 10, 60, TimeUnit.SECONDS, threadFactory, threadPool.getThreadContext());
-        });
-
+        unicastConfiguredHostsResolver
+            = new UnicastConfiguredHostsResolver(settings, transportService, hostsResolver -> transportAddresses);
         unicastConfiguredHostsResolver.start();
     }