honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Change Watcher thread pool to be scaling" 

This reverts commit elastic/x-pack@943bd259f9.

See discussion in elastic/elasticsearch#3660

Original commit: elastic/x-pack-elasticsearch@35d236df59
This commit is contained in:
Alexander Reelsen 2016-10-05 14:45:34 +02:00
parent a7e25cbaf9
commit 5aacf3e205
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/Watcher.java
View File

@ -25,7 +25,7 @@ import org.elasticsearch.plugins.ScriptPlugin;
import org.elasticsearch.rest.RestHandler; import org.elasticsearch.rest.RestHandler;
import org.elasticsearch.script.ScriptContext; import org.elasticsearch.script.ScriptContext;
import org.elasticsearch.threadpool.ExecutorBuilder; import org.elasticsearch.threadpool.ExecutorBuilder;
import org.elasticsearch.threadpool.ScalingExecutorBuilder; import org.elasticsearch.threadpool.FixedExecutorBuilder;
import org.elasticsearch.xpack.XPackPlugin; import org.elasticsearch.xpack.XPackPlugin;
import org.elasticsearch.xpack.XPackSettings; import org.elasticsearch.xpack.XPackSettings;
import org.elasticsearch.xpack.watcher.actions.WatcherActionModule; import org.elasticsearch.xpack.watcher.actions.WatcherActionModule;
@ -165,14 +165,12 @@ public class Watcher implements ActionPlugin, ScriptPlugin {
public List<ExecutorBuilder<?>> getExecutorBuilders(final Settings settings) { public List<ExecutorBuilder<?>> getExecutorBuilders(final Settings settings) {
if (enabled) { if (enabled) {
final ScalingExecutorBuilder builder = final FixedExecutorBuilder builder =
new ScalingExecutorBuilder( new FixedExecutorBuilder(
settings,
InternalWatchExecutor.THREAD_POOL_NAME, InternalWatchExecutor.THREAD_POOL_NAME,
0,
// watcher threads can block on I/O for a long time, so we let this
// pool be large so that execution of unblocked watches can proceed
5 * EsExecutors.boundedNumberOfProcessors(settings), 5 * EsExecutors.boundedNumberOfProcessors(settings),
TimeValue.timeValueMinutes(5), 1000,
"xpack.watcher.thread_pool"); "xpack.watcher.thread_pool");
return Collections.singletonList(builder); return Collections.singletonList(builder);
} }