ThreadPool: Rename dynamic to scaling, closes #75.

Author: kimchy

modules/benchmark/micro/src/main/java/org/elasticsearch/benchmark/index/engine/SimpleEngineBenchmark.java

@@ -39,7 +39,7 @@
 import org.elasticsearch.index.store.memory.ByteBufferStore;
 import org.elasticsearch.index.translog.memory.MemoryTranslog;
 import org.elasticsearch.threadpool.ThreadPool;
-import org.elasticsearch.threadpool.dynamic.DynamicThreadPool;
+import org.elasticsearch.threadpool.scaling.ScalingThreadPool;
 import org.elasticsearch.util.StopWatch;
 import org.elasticsearch.util.TimeValue;
 import org.elasticsearch.util.lucene.Lucene;
@@ -285,7 +285,7 @@ public static void main(String[] args) throws Exception {
 
         store.deleteContent();
 
-        ThreadPool threadPool = new DynamicThreadPool();
+        ThreadPool threadPool = new ScalingThreadPool();
         SnapshotDeletionPolicy deletionPolicy = new SnapshotDeletionPolicy(new KeepOnlyLastDeletionPolicy(shardId, settings));
         Engine engine = new RobinEngine(shardId, settings, store, deletionPolicy, new MemoryTranslog(shardId, settings), new LogByteSizeMergePolicyProvider(store),
                 new ConcurrentMergeSchedulerProvider(shardId, settings), new AnalysisService(shardId.index()), new SimilarityService(shardId.index()));

modules/elasticsearch/src/main/java/org/elasticsearch/threadpool/dynamic/DynamicThreadPool.java renamed to modules/elasticsearch/src/main/java/org/elasticsearch/threadpool/scaling/ScalingThreadPool.java

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.threadpool.dynamic;
+package org.elasticsearch.threadpool.scaling;
 
 import com.google.inject.Inject;
 import org.elasticsearch.threadpool.support.AbstractThreadPool;
@@ -33,19 +33,19 @@
 /**
  * @author kimchy (Shay Banon)
  */
-public class DynamicThreadPool extends AbstractThreadPool {
+public class ScalingThreadPool extends AbstractThreadPool {
 
     private final int min;
     private final int max;
     private final TimeValue keepAlive;
 
     private final int scheduledSize;
 
-    public DynamicThreadPool() {
+    public ScalingThreadPool() {
         this(EMPTY_SETTINGS);
     }
 
-    @Inject public DynamicThreadPool(Settings settings) {
+    @Inject public ScalingThreadPool(Settings settings) {
         super(settings);
         this.min = componentSettings.getAsInt("min", 1);
         this.max = componentSettings.getAsInt("max", 100);

modules/elasticsearch/src/test/java/org/elasticsearch/index/shard/SimpleIndexShardTests.java

@@ -38,7 +38,7 @@
 import org.elasticsearch.index.store.ram.RamStore;
 import org.elasticsearch.index.translog.memory.MemoryTranslog;
 import org.elasticsearch.threadpool.ThreadPool;
-import org.elasticsearch.threadpool.dynamic.DynamicThreadPool;
+import org.elasticsearch.threadpool.scaling.ScalingThreadPool;
 import org.elasticsearch.util.Unicode;
 import org.elasticsearch.util.settings.Settings;
 import org.testng.annotations.AfterMethod;
@@ -75,7 +75,7 @@ public class SimpleIndexShardTests {
                 new LogByteSizeMergePolicyProvider(store), new SerialMergeSchedulerProvider(shardId, settings),
                 analysisService, new SimilarityService(shardId.index()));
 
-        threadPool = new DynamicThreadPool();
+        threadPool = new ScalingThreadPool();
 
         indexShard = new InternalIndexShard(shardId, EMPTY_SETTINGS, store, engine, translog, threadPool, mapperService, queryParserService, filterCache).start();
     }

modules/elasticsearch/src/test/java/org/elasticsearch/monitor/jvm/DeadlockSimulator.java

@@ -21,7 +21,7 @@
 
 import org.elasticsearch.monitor.dump.DumpMonitorService;
 import org.elasticsearch.threadpool.ThreadPool;
-import org.elasticsearch.threadpool.dynamic.DynamicThreadPool;
+import org.elasticsearch.threadpool.scaling.ScalingThreadPool;
 
 import static org.elasticsearch.util.settings.ImmutableSettings.Builder.*;
 
@@ -31,7 +31,7 @@
 public class DeadlockSimulator {
 
     public static void main(String[] args) {
-        ThreadPool threadPool = new DynamicThreadPool();
+        ThreadPool threadPool = new ScalingThreadPool();
         DumpMonitorService dumpMonitorService = new DumpMonitorService();
         JvmMonitorService jvmMonitorService = new JvmMonitorService(EMPTY_SETTINGS, threadPool, dumpMonitorService).start();
 

modules/elasticsearch/src/test/java/org/elasticsearch/transport/local/SimpleLocalTransportTests.java

@@ -21,7 +21,7 @@
 
 import org.elasticsearch.cluster.node.Node;
 import org.elasticsearch.threadpool.ThreadPool;
-import org.elasticsearch.threadpool.dynamic.DynamicThreadPool;
+import org.elasticsearch.threadpool.scaling.ScalingThreadPool;
 import org.elasticsearch.transport.*;
 import org.elasticsearch.util.io.stream.StreamInput;
 import org.elasticsearch.util.io.stream.StreamOutput;
@@ -45,7 +45,7 @@ public class SimpleLocalTransportTests {
     private Node serviceBNode;
 
     @BeforeClass public void setUp() {
-        threadPool = new DynamicThreadPool();
+        threadPool = new ScalingThreadPool();
 
         serviceA = new TransportService(new LocalTransport(threadPool), threadPool).start();
         serviceANode = new Node("A", serviceA.boundAddress().publishAddress());

modules/elasticsearch/src/test/java/org/elasticsearch/transport/netty/SimpleNettyTransportTests.java

@@ -21,7 +21,7 @@
 
 import org.elasticsearch.cluster.node.Node;
 import org.elasticsearch.threadpool.ThreadPool;
-import org.elasticsearch.threadpool.dynamic.DynamicThreadPool;
+import org.elasticsearch.threadpool.scaling.ScalingThreadPool;
 import org.elasticsearch.transport.*;
 import org.elasticsearch.util.io.stream.StreamInput;
 import org.elasticsearch.util.io.stream.StreamOutput;
@@ -45,7 +45,7 @@ public class SimpleNettyTransportTests {
     private Node serviceBNode;
 
     @BeforeClass public void setUp() {
-        threadPool = new DynamicThreadPool();
+        threadPool = new ScalingThreadPool();
 
         serviceA = new TransportService(new NettyTransport(threadPool), threadPool).start();
         serviceANode = new Node("A", serviceA.boundAddress().publishAddress());