Thread Pool: Allow to configure the query_type for fixed thread pool (linked/array), defaults to array, closes #2086.

This commit is contained in:
Shay Banon 2012-07-06 11:48:45 +02:00
parent 8d1e04a973
commit 5d93b2bfe9
1 changed files with 9 additions and 2 deletions

View File

@ -240,15 +240,22 @@ public class ThreadPool extends AbstractComponent {
} else { } else {
throw new ElasticSearchIllegalArgumentException("reject_policy [" + rejectSetting + "] not valid for [" + name + "] thread pool"); throw new ElasticSearchIllegalArgumentException("reject_policy [" + rejectSetting + "] not valid for [" + name + "] thread pool");
} }
logger.debug("creating thread_pool [{}], type [{}], size [{}], queue_size [{}], reject_policy [{}]", name, type, size, capacity, rejectSetting); String queueType = settings.get("queue_type", "linked");
BlockingQueue<Runnable> workQueue; BlockingQueue<Runnable> workQueue;
if (capacity == null) { if (capacity == null) {
workQueue = new LinkedTransferQueue<Runnable>(); workQueue = new LinkedTransferQueue<Runnable>();
} else if ((int) capacity.singles() > 0) { } else if ((int) capacity.singles() > 0) {
workQueue = new ArrayBlockingQueue<Runnable>((int) capacity.singles()); if ("linked".equals(queueType)) {
workQueue = new LinkedBlockingQueue<Runnable>((int) capacity.singles());
} else if ("array".equals(queueType)) {
workQueue = new ArrayBlockingQueue<Runnable>((int) capacity.singles());
} else {
throw new ElasticSearchIllegalArgumentException("illegal queue_type set to [" + queueType + "], should be either linked or array");
}
} else { } else {
workQueue = new SynchronousQueue<Runnable>(); workQueue = new SynchronousQueue<Runnable>();
} }
logger.debug("creating thread_pool [{}], type [{}], size [{}], queue_size [{}], reject_policy [{}], queue_type [{}]", name, type, size, capacity, rejectSetting, queueType);
Executor executor = new EsThreadPoolExecutor(size, size, Executor executor = new EsThreadPoolExecutor(size, size,
0L, TimeUnit.MILLISECONDS, 0L, TimeUnit.MILLISECONDS,
workQueue, workQueue,