honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-19 19:35:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleanup removable of reject_policy

Browse Source
This commit is contained in:
Shay Banon 2013-08-23 12:15:34 +02:00
parent 048a02eebc
commit 1ac00a13fb
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/org/elasticsearch/threadpool/ThreadPool.java
View File

@ -298,7 +298,6 @@ public class ThreadPool extends AbstractComponent {
} else if ("fixed".equals(type)) { } else if ("fixed".equals(type)) {
int defaultSize = defaultSettings.getAsInt("size", EsExecutors.boundedNumberOfProcessors()); int defaultSize = defaultSettings.getAsInt("size", EsExecutors.boundedNumberOfProcessors());
SizeValue defaultQueueSize = defaultSettings.getAsSize("queue", defaultSettings.getAsSize("queue_size", null)); SizeValue defaultQueueSize = defaultSettings.getAsSize("queue", defaultSettings.getAsSize("queue_size", null));
String defaultRejectSetting = defaultSettings.get("reject_policy", "abort");
String defaultQueueType = defaultSettings.get("queue_type", "linked"); String defaultQueueType = defaultSettings.get("queue_type", "linked");
if (previousExecutorHolder != null) { if (previousExecutorHolder != null) {
@ -329,7 +328,7 @@ public class ThreadPool extends AbstractComponent {
SizeValue queueSize = settings.getAsSize("capacity", settings.getAsSize("queue", settings.getAsSize("queue_size", defaultQueueSize))); SizeValue queueSize = settings.getAsSize("capacity", settings.getAsSize("queue", settings.getAsSize("queue_size", defaultQueueSize)));
String queueType = settings.get("queue_type", defaultQueueType); String queueType = settings.get("queue_type", defaultQueueType);
BlockingQueue<Runnable> workQueue = newQueue(queueSize, queueType); BlockingQueue<Runnable> workQueue = newQueue(queueSize, queueType);
logger.debug("creating thread_pool [{}], type [{}], size [{}], queue_size [{}], reject_policy [{}], queue_type [{}]", name, type, size, queueSize, queueType); logger.debug("creating thread_pool [{}], type [{}], size [{}], queue_size [{}], queue_type [{}]", name, type, size, queueSize, queueType);
Executor executor = EsExecutors.newFixed(size, workQueue, threadFactory); Executor executor = EsExecutors.newFixed(size, workQueue, threadFactory);
return new ExecutorHolder(executor, new Info(name, type, size, size, null, queueSize, queueType)); return new ExecutorHolder(executor, new Info(name, type, size, size, null, queueSize, queueType));
} else if ("scaling".equals(type)) { } else if ("scaling".equals(type)) {