Named thread pools (mongodb#387)

nurkiewicz · rozza · commit d6d70d1a2b37 · 2017-03-01T14:05:10.000Z
JAVA-2458
diff --git a/driver-core/src/main/com/mongodb/connection/DefaultConnectionPool.java b/driver-core/src/main/com/mongodb/connection/DefaultConnectionPool.java
@@ -56,7 +56,6 @@
 
 class DefaultConnectionPool implements ConnectionPool {
     private static final Logger LOGGER = Loggers.getLogger("connection");
-    private static final DaemonThreadFactory THREAD_FACTORY = new DaemonThreadFactory();
 
     private final ConcurrentPool<UsageTrackingInternalConnection> pool;
     private final ConnectionPoolSettings settings;
@@ -77,7 +76,7 @@ class DefaultConnectionPool implements ConnectionPool {
         = new UsageTrackingInternalConnectionItemFactory(internalConnectionFactory);
         pool = new ConcurrentPool<UsageTrackingInternalConnection>(settings.getMaxSize(), connectionItemFactory);
         maintenanceTask = createMaintenanceTask();
-        sizeMaintenanceTimer = createTimer();
+        sizeMaintenanceTimer = createMaintenanceTimer();
         this.connectionPoolListener = notNull("connectionPoolListener", connectionPoolListener);
         connectionPoolListener.connectionPoolOpened(new ConnectionPoolOpenedEvent(serverId, settings));
     }
@@ -214,7 +213,7 @@ public void onResult(final Void result, final Throwable t) {
 
     private synchronized ExecutorService getAsyncGetter() {
         if (asyncGetter == null) {
-            asyncGetter = Executors.newSingleThreadExecutor(THREAD_FACTORY);
+            asyncGetter = Executors.newSingleThreadExecutor(new DaemonThreadFactory("AsyncGetter"));
         }
         return asyncGetter;
     }
@@ -311,11 +310,11 @@ public synchronized void run() {
         return newMaintenanceTask;
     }
 
-    private ExecutorService createTimer() {
+    private ExecutorService createMaintenanceTimer() {
         if (maintenanceTask == null) {
             return null;
         } else {
-            ScheduledExecutorService newTimer = Executors.newSingleThreadScheduledExecutor(THREAD_FACTORY);
+            ScheduledExecutorService newTimer = Executors.newSingleThreadScheduledExecutor(new DaemonThreadFactory("MaintenanceTimer"));
             newTimer.scheduleAtFixedRate(maintenanceTask, settings.getMaintenanceInitialDelay(MILLISECONDS),
                                          settings.getMaintenanceFrequency(MILLISECONDS), MILLISECONDS);
             return newTimer;
diff --git a/driver-core/src/main/com/mongodb/internal/thread/DaemonThreadFactory.java b/driver-core/src/main/com/mongodb/internal/thread/DaemonThreadFactory.java
@@ -31,10 +31,6 @@ public class DaemonThreadFactory implements ThreadFactory {
     private final AtomicInteger threadNumber = new AtomicInteger(1);
     private final String namePrefix;
 
-    public DaemonThreadFactory() {
-        this("pool");
-    }
-
     public DaemonThreadFactory(final String prefix) {
         namePrefix = prefix + "-" + POOL_NUMBER.getAndIncrement() + "-thread-";
     }
diff --git a/driver/src/main/com/mongodb/Mongo.java b/driver/src/main/com/mongodb/Mongo.java
@@ -849,7 +849,7 @@ <T> T execute(final WriteOperation<T> operation) {
     }
 
     private ExecutorService createCursorCleaningService() {
-        ScheduledExecutorService newTimer = Executors.newSingleThreadScheduledExecutor(new DaemonThreadFactory());
+        ScheduledExecutorService newTimer = Executors.newSingleThreadScheduledExecutor(new DaemonThreadFactory("CleanCursors"));
         newTimer.scheduleAtFixedRate(new Runnable() {
             @Override
             public void run() {

Original file line number	Diff line number	Diff line change
`@@ -849,7 +849,7 @@ <T> T execute(final WriteOperation<T> operation) {`
`849`	`849`	`}`
`850`	`850`
`851`	`851`	`private ExecutorService createCursorCleaningService() {`
`852`		`- ScheduledExecutorService newTimer = Executors.newSingleThreadScheduledExecutor(new DaemonThreadFactory());`
	`852`	`+ ScheduledExecutorService newTimer = Executors.newSingleThreadScheduledExecutor(new DaemonThreadFactory("CleanCursors"));`
`853`	`853`	`newTimer.scheduleAtFixedRate(new Runnable() {`
`854`	`854`	`@Override`
`855`	`855`	`public void run() {`