Ensure all our threadpools are setup correctly

twitter-archive · Mar 14, 2012 · 40e0e2d · 40e0e2d
1 parent 0179a0d
commit 40e0e2d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/querulous-core/src/main/scala/com/twitter/querulous/DaemonThreadFactory.scala b/querulous-core/src/main/scala/com/twitter/querulous/DaemonThreadFactory.scala
@@ -3,12 +3,12 @@ package com.twitter.querulous
 import java.util.concurrent.ThreadFactory
 import java.util.concurrent.atomic.AtomicInteger
 
-class DaemonThreadFactory extends ThreadFactory {
-  val group        = new ThreadGroup(Thread.currentThread().getThreadGroup(), "querulous")
+class DaemonThreadFactory(nameSuffix : String) extends ThreadFactory {
+  val group        = new ThreadGroup(Thread.currentThread().getThreadGroup(), "querulous-" + nameSuffix)
   val threadNumber = new AtomicInteger(1)
 
   def newThread(r: Runnable) = {
-    val thread = new Thread(group, r, "querulous-" + threadNumber.getAndIncrement())
+    val thread = new Thread(group, r, "querulous-" + nameSuffix + "-" + threadNumber.getAndIncrement())
     if (!thread.isDaemon) {
       thread.setDaemon(true)
     }

diff --git a/querulous-core/src/main/scala/com/twitter/querulous/FutureTimeout.scala b/querulous-core/src/main/scala/com/twitter/querulous/FutureTimeout.scala
@@ -12,7 +12,7 @@ class FutureTimeout(poolSize: Int, queueSize: Int) {
     60,
     TimeUnit.SECONDS,
     new LinkedBlockingQueue[Runnable](queueSize),
-    new DaemonThreadFactory()
+    new DaemonThreadFactory("futureTimeout")
   )
 
   class Task[T](f: => T)(onTimeout: T => Unit) extends Callable[T] {

diff --git a/querulous-core/src/main/scala/com/twitter/querulous/async/AsyncQueryEvaluator.scala b/querulous-core/src/main/scala/com/twitter/querulous/async/AsyncQueryEvaluator.scala
@@ -12,7 +12,7 @@ import com.twitter.conversions.time._
 
 
 object AsyncQueryEvaluator extends AsyncQueryEvaluatorFactory {
-  lazy val defaultWorkPool = FuturePool(Executors.newCachedThreadPool(new DaemonThreadFactory))
+  lazy val defaultWorkPool = FuturePool(Executors.newCachedThreadPool(new DaemonThreadFactory("asyncWorkPool")))
   lazy val defaultMaxWaiters = Int.MaxValue
 
   def checkoutPool(maxWaiters: Int) = {
@@ -22,7 +22,8 @@ object AsyncQueryEvaluator extends AsyncQueryEvaluatorFactory {
         1, /* max size */
         0, /* ignored, since the sizes are the same */
         TimeUnit.MILLISECONDS, /* similarly ignored */
-        new LinkedBlockingQueue(maxWaiters)))
+        new LinkedBlockingQueue[Runnable](maxWaiters),
+        new DaemonThreadFactory("asyncCheckoutPool")))
   }
 
   private def createEvaluatorFactory() = {