From c08b96824605b62841193a80a75a2255d8348515 Mon Sep 17 00:00:00 2001 From: Shay Banon Date: Fri, 9 Mar 2012 20:32:33 +0200 Subject: [PATCH] rename the cached thread pool to generic (from cached), since really, cached is meaningless, and its actually a generic thread pool we use for different operations --- .../action/TransportActionNodeProxy.java | 2 +- .../health/TransportClusterHealthAction.java | 2 +- .../restart/TransportNodesRestartAction.java | 4 +-- .../TransportNodesShutdownAction.java | 2 +- .../TransportClusterRerouteAction.java | 2 +- .../state/TransportClusterStateAction.java | 2 +- .../AbstractListenableActionFuture.java | 4 +-- .../action/support/TransportAction.java | 4 +-- .../nodes/TransportNodesOperationAction.java | 2 +- .../TransportClientNodesService.java | 4 +-- .../action/index/MappingUpdatedAction.java | 4 +-- .../index/NodeAliasesUpdatedAction.java | 4 +-- .../action/index/NodeIndexCreatedAction.java | 2 +- .../action/index/NodeIndexDeletedAction.java | 2 +- .../index/NodeMappingCreatedAction.java | 4 +-- .../index/NodeMappingRefreshAction.java | 2 +- .../service/InternalClusterService.java | 8 +++--- .../discovery/zen/ZenDiscovery.java | 2 +- .../zen/fd/MasterFaultDetection.java | 6 ++--- .../discovery/zen/fd/NodesFaultDetection.java | 4 +-- .../zen/membership/MembershipAction.java | 2 +- .../zen/ping/multicast/MulticastZenPing.java | 8 +++--- .../zen/ping/unicast/UnicastZenPing.java | 4 +-- .../elasticsearch/gateway/GatewayService.java | 4 +-- .../TransportNodesListGatewayMetaState.java | 2 +- ...ransportNodesListGatewayStartedShards.java | 2 +- .../gateway/shared/SharedStorageGateway.java | 2 +- .../cache/bloom/simple/SimpleBloomCache.java | 4 +-- .../gateway/IndexShardGatewayService.java | 2 +- .../index/service/InternalIndexService.java | 2 +- .../cluster/IndicesClusterStateService.java | 4 +-- .../indices/recovery/RecoverySource.java | 2 +- .../indices/recovery/RecoveryTarget.java | 14 +++++----- .../TransportNodesListShardStoreMetaData.java | 2 +- .../elasticsearch/river/RiversService.java | 2 +- .../elasticsearch/threadpool/ThreadPool.java | 8 +++--- .../transport/TransportService.java | 10 +++---- .../VoidTransportResponseHandler.java | 1 - .../transport/local/LocalTransport.java | 2 +- .../local/LocalTransportChannel.java | 4 +-- .../transport/netty/NettyTransport.java | 4 +-- .../BenchmarkNettyLargeMessages.java | 2 +- .../transport/TransportBenchmark.java | 2 +- .../AbstractSimpleTransportTests.java | 26 +++++++++---------- 44 files changed, 86 insertions(+), 95 deletions(-) diff --git a/src/main/java/org/elasticsearch/action/TransportActionNodeProxy.java b/src/main/java/org/elasticsearch/action/TransportActionNodeProxy.java index e474082f5fd..92e49b5acbd 100644 --- a/src/main/java/org/elasticsearch/action/TransportActionNodeProxy.java +++ b/src/main/java/org/elasticsearch/action/TransportActionNodeProxy.java @@ -62,7 +62,7 @@ public class TransportActionNodeProxy extends AdapterAction private void executeListener(final Object listener) { if (listenerThreaded) { if (listener instanceof Runnable) { - threadPool.cached().execute((Runnable) listener); + threadPool.generic().execute((Runnable) listener); } else { - threadPool.cached().execute(new Runnable() { + threadPool.generic().execute(new Runnable() { @Override public void run() { ActionListener lst = (ActionListener) listener; diff --git a/src/main/java/org/elasticsearch/action/support/TransportAction.java b/src/main/java/org/elasticsearch/action/support/TransportAction.java index 8d604dd5a9c..7171e403bd4 100644 --- a/src/main/java/org/elasticsearch/action/support/TransportAction.java +++ b/src/main/java/org/elasticsearch/action/support/TransportAction.java @@ -79,7 +79,7 @@ public abstract class TransportAction { @@ -63,7 +61,7 @@ public class MappingUpdatedAction extends TransportMasterNodeOperationAction implemen // we are already joining, ignore... return; } - threadPool.cached().execute(new Runnable() { + threadPool.generic().execute(new Runnable() { @Override public void run() { currentJoinThread = Thread.currentThread(); diff --git a/src/main/java/org/elasticsearch/discovery/zen/fd/MasterFaultDetection.java b/src/main/java/org/elasticsearch/discovery/zen/fd/MasterFaultDetection.java index b598d196e41..e38319fa9c0 100644 --- a/src/main/java/org/elasticsearch/discovery/zen/fd/MasterFaultDetection.java +++ b/src/main/java/org/elasticsearch/discovery/zen/fd/MasterFaultDetection.java @@ -41,8 +41,6 @@ import static org.elasticsearch.transport.TransportRequestOptions.options; /** * A fault detection that pings the master periodically to see if its alive. - * - * */ public class MasterFaultDetection extends AbstractComponent { @@ -214,7 +212,7 @@ public class MasterFaultDetection extends AbstractComponent { } private void notifyDisconnectedFromMaster() { - threadPool.cached().execute(new Runnable() { + threadPool.generic().execute(new Runnable() { @Override public void run() { for (Listener listener : listeners) { @@ -226,7 +224,7 @@ public class MasterFaultDetection extends AbstractComponent { private void notifyMasterFailure(final DiscoveryNode masterNode, final String reason) { if (notifiedMasterFailure.compareAndSet(false, true)) { - threadPool.cached().execute(new Runnable() { + threadPool.generic().execute(new Runnable() { @Override public void run() { for (Listener listener : listeners) { diff --git a/src/main/java/org/elasticsearch/discovery/zen/fd/NodesFaultDetection.java b/src/main/java/org/elasticsearch/discovery/zen/fd/NodesFaultDetection.java index 58f68d9da88..0bdac9040e2 100644 --- a/src/main/java/org/elasticsearch/discovery/zen/fd/NodesFaultDetection.java +++ b/src/main/java/org/elasticsearch/discovery/zen/fd/NodesFaultDetection.java @@ -42,8 +42,6 @@ import static org.elasticsearch.transport.TransportRequestOptions.options; /** * A fault detection of multiple nodes. - * - * */ public class NodesFaultDetection extends AbstractComponent { @@ -180,7 +178,7 @@ public class NodesFaultDetection extends AbstractComponent { } private void notifyNodeFailure(final DiscoveryNode node, final String reason) { - threadPool.cached().execute(new Runnable() { + threadPool.generic().execute(new Runnable() { @Override public void run() { for (Listener listener : listeners) { diff --git a/src/main/java/org/elasticsearch/discovery/zen/membership/MembershipAction.java b/src/main/java/org/elasticsearch/discovery/zen/membership/MembershipAction.java index 1666c88c0e7..dca6db0a2c9 100644 --- a/src/main/java/org/elasticsearch/discovery/zen/membership/MembershipAction.java +++ b/src/main/java/org/elasticsearch/discovery/zen/membership/MembershipAction.java @@ -159,7 +159,7 @@ public class MembershipAction extends AbstractComponent { @Override public String executor() { - return ThreadPool.Names.CACHED; + return ThreadPool.Names.GENERIC; } } diff --git a/src/main/java/org/elasticsearch/discovery/zen/ping/multicast/MulticastZenPing.java b/src/main/java/org/elasticsearch/discovery/zen/ping/multicast/MulticastZenPing.java index 0b025f2c341..5831e3ad667 100644 --- a/src/main/java/org/elasticsearch/discovery/zen/ping/multicast/MulticastZenPing.java +++ b/src/main/java/org/elasticsearch/discovery/zen/ping/multicast/MulticastZenPing.java @@ -229,7 +229,7 @@ public class MulticastZenPing extends AbstractLifecycleComponent implem @Override public void ping(final PingListener listener, final TimeValue timeout) { if (!pingEnabled) { - threadPool.cached().execute(new Runnable() { + threadPool.generic().execute(new Runnable() { @Override public void run() { listener.onPing(new PingResponse[0]); @@ -242,7 +242,7 @@ public class MulticastZenPing extends AbstractLifecycleComponent implem sendPingRequest(id); // try and send another ping request halfway through (just in case someone woke up during it...) // this can be a good trade-off to nailing the initial lookup or un-delivered messages - threadPool.schedule(TimeValue.timeValueMillis(timeout.millis() / 2), ThreadPool.Names.CACHED, new Runnable() { + threadPool.schedule(TimeValue.timeValueMillis(timeout.millis() / 2), ThreadPool.Names.GENERIC, new Runnable() { @Override public void run() { try { @@ -252,7 +252,7 @@ public class MulticastZenPing extends AbstractLifecycleComponent implem } } }); - threadPool.schedule(timeout, ThreadPool.Names.CACHED, new Runnable() { + threadPool.schedule(timeout, ThreadPool.Names.GENERIC, new Runnable() { @Override public void run() { ConcurrentMap responses = receivedResponses.remove(id); @@ -522,7 +522,7 @@ public class MulticastZenPing extends AbstractLifecycleComponent implem if (!transportService.nodeConnected(requestingNode)) { // do the connect and send on a thread pool - threadPool.cached().execute(new Runnable() { + threadPool.generic().execute(new Runnable() { @Override public void run() { // connect to the node if possible diff --git a/src/main/java/org/elasticsearch/discovery/zen/ping/unicast/UnicastZenPing.java b/src/main/java/org/elasticsearch/discovery/zen/ping/unicast/UnicastZenPing.java index ba0431a7882..6e8dca656ae 100644 --- a/src/main/java/org/elasticsearch/discovery/zen/ping/unicast/UnicastZenPing.java +++ b/src/main/java/org/elasticsearch/discovery/zen/ping/unicast/UnicastZenPing.java @@ -168,11 +168,11 @@ public class UnicastZenPing extends AbstractLifecycleComponent implemen final SendPingsHandler sendPingsHandler = new SendPingsHandler(pingIdGenerator.incrementAndGet()); receivedResponses.put(sendPingsHandler.id(), new ConcurrentHashMap()); sendPings(timeout, null, sendPingsHandler); - threadPool.schedule(TimeValue.timeValueMillis(timeout.millis() / 2), ThreadPool.Names.CACHED, new Runnable() { + threadPool.schedule(TimeValue.timeValueMillis(timeout.millis() / 2), ThreadPool.Names.GENERIC, new Runnable() { @Override public void run() { sendPings(timeout, null, sendPingsHandler); - threadPool.schedule(TimeValue.timeValueMillis(timeout.millis() / 2), ThreadPool.Names.CACHED, new Runnable() { + threadPool.schedule(TimeValue.timeValueMillis(timeout.millis() / 2), ThreadPool.Names.GENERIC, new Runnable() { @Override public void run() { sendPings(timeout, TimeValue.timeValueMillis(timeout.millis() / 2), sendPingsHandler); diff --git a/src/main/java/org/elasticsearch/gateway/GatewayService.java b/src/main/java/org/elasticsearch/gateway/GatewayService.java index a732225af97..0e0ba7fd371 100644 --- a/src/main/java/org/elasticsearch/gateway/GatewayService.java +++ b/src/main/java/org/elasticsearch/gateway/GatewayService.java @@ -194,7 +194,7 @@ public class GatewayService extends AbstractLifecycleComponent i } } final boolean fIgnoreRecoverAfterTime = ignoreRecoverAfterTime; - threadPool.cached().execute(new Runnable() { + threadPool.generic().execute(new Runnable() { @Override public void run() { performStateRecovery(fIgnoreRecoverAfterTime); @@ -210,7 +210,7 @@ public class GatewayService extends AbstractLifecycleComponent i if (!ignoreRecoverAfterTime && recoverAfterTime != null) { if (scheduledRecovery.compareAndSet(false, true)) { logger.debug("delaying initial state recovery for [{}]", recoverAfterTime); - threadPool.schedule(recoverAfterTime, ThreadPool.Names.CACHED, new Runnable() { + threadPool.schedule(recoverAfterTime, ThreadPool.Names.GENERIC, new Runnable() { @Override public void run() { if (recovered.compareAndSet(false, true)) { diff --git a/src/main/java/org/elasticsearch/gateway/local/state/meta/TransportNodesListGatewayMetaState.java b/src/main/java/org/elasticsearch/gateway/local/state/meta/TransportNodesListGatewayMetaState.java index e798b03bff5..a39113a349b 100644 --- a/src/main/java/org/elasticsearch/gateway/local/state/meta/TransportNodesListGatewayMetaState.java +++ b/src/main/java/org/elasticsearch/gateway/local/state/meta/TransportNodesListGatewayMetaState.java @@ -65,7 +65,7 @@ public class TransportNodesListGatewayMetaState extends TransportNodesOperationA @Override protected String executor() { - return ThreadPool.Names.CACHED; + return ThreadPool.Names.GENERIC; } @Override diff --git a/src/main/java/org/elasticsearch/gateway/local/state/shards/TransportNodesListGatewayStartedShards.java b/src/main/java/org/elasticsearch/gateway/local/state/shards/TransportNodesListGatewayStartedShards.java index b0cca8da8a6..66170c13355 100644 --- a/src/main/java/org/elasticsearch/gateway/local/state/shards/TransportNodesListGatewayStartedShards.java +++ b/src/main/java/org/elasticsearch/gateway/local/state/shards/TransportNodesListGatewayStartedShards.java @@ -66,7 +66,7 @@ public class TransportNodesListGatewayStartedShards extends TransportNodesOperat @Override protected String executor() { - return ThreadPool.Names.CACHED; + return ThreadPool.Names.GENERIC; } @Override diff --git a/src/main/java/org/elasticsearch/gateway/shared/SharedStorageGateway.java b/src/main/java/org/elasticsearch/gateway/shared/SharedStorageGateway.java index 3b3d92cbfe0..34457607625 100644 --- a/src/main/java/org/elasticsearch/gateway/shared/SharedStorageGateway.java +++ b/src/main/java/org/elasticsearch/gateway/shared/SharedStorageGateway.java @@ -79,7 +79,7 @@ public abstract class SharedStorageGateway extends AbstractLifecycleComponent shardIds = shardIds(); final CountDownLatch latch = new CountDownLatch(shardIds.size()); for (final int shardId : shardIds) { - executor = executor == null ? threadPool.cached() : executor; + executor = executor == null ? threadPool.generic() : executor; executor.execute(new Runnable() { @Override public void run() { diff --git a/src/main/java/org/elasticsearch/indices/cluster/IndicesClusterStateService.java b/src/main/java/org/elasticsearch/indices/cluster/IndicesClusterStateService.java index 6e2493ec8d0..83369600227 100644 --- a/src/main/java/org/elasticsearch/indices/cluster/IndicesClusterStateService.java +++ b/src/main/java/org/elasticsearch/indices/cluster/IndicesClusterStateService.java @@ -646,7 +646,7 @@ public class IndicesClusterStateService extends AbstractLifecycleComponent { ImmutableSet indices = ImmutableSet.copyOf(this.rivers.keySet()); final CountDownLatch latch = new CountDownLatch(indices.size()); for (final RiverName riverName : indices) { - threadPool.cached().execute(new Runnable() { + threadPool.generic().execute(new Runnable() { @Override public void run() { try { diff --git a/src/main/java/org/elasticsearch/threadpool/ThreadPool.java b/src/main/java/org/elasticsearch/threadpool/ThreadPool.java index 8bebb5287f8..3571eb3cdaa 100644 --- a/src/main/java/org/elasticsearch/threadpool/ThreadPool.java +++ b/src/main/java/org/elasticsearch/threadpool/ThreadPool.java @@ -58,7 +58,7 @@ public class ThreadPool extends AbstractComponent { public static class Names { public static final String SAME = "same"; - public static final String CACHED = "cached"; + public static final String GENERIC = "generic"; public static final String INDEX = "index"; public static final String BULK = "bulk"; public static final String SEARCH = "search"; @@ -87,7 +87,7 @@ public class ThreadPool extends AbstractComponent { Map groupSettings = settings.getGroups("threadpool"); Map executors = Maps.newHashMap(); - executors.put(Names.CACHED, build(Names.CACHED, "cached", groupSettings.get(Names.CACHED), settingsBuilder().put("keep_alive", "30s").build())); + executors.put(Names.GENERIC, build(Names.GENERIC, "cached", groupSettings.get(Names.GENERIC), settingsBuilder().put("keep_alive", "30s").build())); executors.put(Names.INDEX, build(Names.INDEX, "cached", groupSettings.get(Names.INDEX), ImmutableSettings.Builder.EMPTY_SETTINGS)); executors.put(Names.BULK, build(Names.BULK, "cached", groupSettings.get(Names.BULK), ImmutableSettings.Builder.EMPTY_SETTINGS)); executors.put(Names.SEARCH, build(Names.SEARCH, "cached", groupSettings.get(Names.SEARCH), ImmutableSettings.Builder.EMPTY_SETTINGS)); @@ -147,8 +147,8 @@ public class ThreadPool extends AbstractComponent { return new ThreadPoolStats(stats); } - public Executor cached() { - return executor(Names.CACHED); + public Executor generic() { + return executor(Names.GENERIC); } public Executor executor(String name) { diff --git a/src/main/java/org/elasticsearch/transport/TransportService.java b/src/main/java/org/elasticsearch/transport/TransportService.java index 4f148c7088b..6cc181697d6 100644 --- a/src/main/java/org/elasticsearch/transport/TransportService.java +++ b/src/main/java/org/elasticsearch/transport/TransportService.java @@ -179,7 +179,7 @@ public class TransportService extends AbstractLifecycleComponent(handler, node, action, timeoutHandler)); transport.sendRequest(node, requestId, action, message, options); @@ -198,7 +198,7 @@ public class TransportService extends AbstractLifecycleComponent { public static final VoidTransportResponseHandler INSTANCE_SAME = new VoidTransportResponseHandler(ThreadPool.Names.SAME); - public static final VoidTransportResponseHandler INSTANCE_CACHED = new VoidTransportResponseHandler(ThreadPool.Names.CACHED); private final String executor; diff --git a/src/main/java/org/elasticsearch/transport/local/LocalTransport.java b/src/main/java/org/elasticsearch/transport/local/LocalTransport.java index 84c89ccde6a..cde0ba20981 100644 --- a/src/main/java/org/elasticsearch/transport/local/LocalTransport.java +++ b/src/main/java/org/elasticsearch/transport/local/LocalTransport.java @@ -178,7 +178,7 @@ public class LocalTransport extends AbstractLifecycleComponent implem transportServiceAdapter.sent(data.length); - threadPool.cached().execute(new Runnable() { + threadPool.generic().execute(new Runnable() { @Override public void run() { targetTransport.messageReceived(data, action, LocalTransport.this, requestId); diff --git a/src/main/java/org/elasticsearch/transport/local/LocalTransportChannel.java b/src/main/java/org/elasticsearch/transport/local/LocalTransportChannel.java index 5536e8940cf..5c5610be4c1 100644 --- a/src/main/java/org/elasticsearch/transport/local/LocalTransportChannel.java +++ b/src/main/java/org/elasticsearch/transport/local/LocalTransportChannel.java @@ -75,7 +75,7 @@ public class LocalTransportChannel implements TransportChannel { stream.writeByte(status); // 0 for request, 1 for response. message.writeTo(stream); final byte[] data = cachedEntry.bytes().copiedByteArray(); - targetTransport.threadPool().cached().execute(new Runnable() { + targetTransport.threadPool().generic().execute(new Runnable() { @Override public void run() { targetTransport.messageReceived(data, action, sourceTransport, null); @@ -107,7 +107,7 @@ public class LocalTransportChannel implements TransportChannel { too.close(); } final byte[] data = stream.copiedByteArray(); - targetTransport.threadPool().cached().execute(new Runnable() { + targetTransport.threadPool().generic().execute(new Runnable() { @Override public void run() { targetTransport.messageReceived(data, action, sourceTransport, null); diff --git a/src/main/java/org/elasticsearch/transport/netty/NettyTransport.java b/src/main/java/org/elasticsearch/transport/netty/NettyTransport.java index d6efbc287be..cbc75a529ff 100644 --- a/src/main/java/org/elasticsearch/transport/netty/NettyTransport.java +++ b/src/main/java/org/elasticsearch/transport/netty/NettyTransport.java @@ -77,8 +77,6 @@ import static org.elasticsearch.common.util.concurrent.EsExecutors.daemonThreadF * There are 3 types of connections per node, low/med/high. Low if for batch oriented APIs (like recovery or * batch) with high payload that will cause regular request. (like search or single index) to take * longer. Med is for the typical search / single doc index. And High is for ping type requests (like FD). - * - * */ public class NettyTransport extends AbstractLifecycleComponent implements Transport { @@ -315,7 +313,7 @@ public class NettyTransport extends AbstractLifecycleComponent implem protected void doStop() throws ElasticSearchException { final CountDownLatch latch = new CountDownLatch(1); // make sure we run it on another thread than a possible IO handler thread - threadPool.cached().execute(new Runnable() { + threadPool.generic().execute(new Runnable() { @Override public void run() { try { diff --git a/src/test/java/org/elasticsearch/benchmark/transport/BenchmarkNettyLargeMessages.java b/src/test/java/org/elasticsearch/benchmark/transport/BenchmarkNettyLargeMessages.java index 60e874e8099..94378935ed1 100644 --- a/src/test/java/org/elasticsearch/benchmark/transport/BenchmarkNettyLargeMessages.java +++ b/src/test/java/org/elasticsearch/benchmark/transport/BenchmarkNettyLargeMessages.java @@ -67,7 +67,7 @@ public class BenchmarkNettyLargeMessages { @Override public String executor() { - return ThreadPool.Names.CACHED; + return ThreadPool.Names.GENERIC; } @Override diff --git a/src/test/java/org/elasticsearch/benchmark/transport/TransportBenchmark.java b/src/test/java/org/elasticsearch/benchmark/transport/TransportBenchmark.java index 157ab8bbd37..fe90106cd57 100644 --- a/src/test/java/org/elasticsearch/benchmark/transport/TransportBenchmark.java +++ b/src/test/java/org/elasticsearch/benchmark/transport/TransportBenchmark.java @@ -56,7 +56,7 @@ public class TransportBenchmark { } public static void main(String[] args) { - final String executor = ThreadPool.Names.CACHED; + final String executor = ThreadPool.Names.GENERIC; final boolean waitForRequest = true; final ByteSizeValue payloadSize = new ByteSizeValue(100, ByteSizeUnit.BYTES); final int NUMBER_OF_CLIENTS = 1; diff --git a/src/test/java/org/elasticsearch/test/unit/transport/AbstractSimpleTransportTests.java b/src/test/java/org/elasticsearch/test/unit/transport/AbstractSimpleTransportTests.java index d120dad5e8a..38cfb25667c 100644 --- a/src/test/java/org/elasticsearch/test/unit/transport/AbstractSimpleTransportTests.java +++ b/src/test/java/org/elasticsearch/test/unit/transport/AbstractSimpleTransportTests.java @@ -79,7 +79,7 @@ public abstract class AbstractSimpleTransportTests { @Override public String executor() { - return ThreadPool.Names.CACHED; + return ThreadPool.Names.GENERIC; } @Override @@ -103,7 +103,7 @@ public abstract class AbstractSimpleTransportTests { @Override public String executor() { - return ThreadPool.Names.CACHED; + return ThreadPool.Names.GENERIC; } @Override @@ -138,7 +138,7 @@ public abstract class AbstractSimpleTransportTests { @Override public String executor() { - return ThreadPool.Names.CACHED; + return ThreadPool.Names.GENERIC; } @Override @@ -161,7 +161,7 @@ public abstract class AbstractSimpleTransportTests { @Override public String executor() { - return ThreadPool.Names.CACHED; + return ThreadPool.Names.GENERIC; } @Override @@ -195,7 +195,7 @@ public abstract class AbstractSimpleTransportTests { @Override public String executor() { - return ThreadPool.Names.CACHED; + return ThreadPool.Names.GENERIC; } @Override @@ -219,7 +219,7 @@ public abstract class AbstractSimpleTransportTests { @Override public String executor() { - return ThreadPool.Names.CACHED; + return ThreadPool.Names.GENERIC; } @Override @@ -254,7 +254,7 @@ public abstract class AbstractSimpleTransportTests { @Override public String executor() { - return ThreadPool.Names.CACHED; + return ThreadPool.Names.GENERIC; } @Override @@ -273,7 +273,7 @@ public abstract class AbstractSimpleTransportTests { @Override public String executor() { - return ThreadPool.Names.CACHED; + return ThreadPool.Names.GENERIC; } @Override @@ -326,7 +326,7 @@ public abstract class AbstractSimpleTransportTests { @Override public String executor() { - return ThreadPool.Names.CACHED; + return ThreadPool.Names.GENERIC; } @Override @@ -351,7 +351,7 @@ public abstract class AbstractSimpleTransportTests { @Override public String executor() { - return ThreadPool.Names.CACHED; + return ThreadPool.Names.GENERIC; } @Override @@ -385,7 +385,7 @@ public abstract class AbstractSimpleTransportTests { @Override public String executor() { - return ThreadPool.Names.CACHED; + return ThreadPool.Names.GENERIC; } @Override @@ -414,7 +414,7 @@ public abstract class AbstractSimpleTransportTests { @Override public String executor() { - return ThreadPool.Names.CACHED; + return ThreadPool.Names.GENERIC; } @Override @@ -450,7 +450,7 @@ public abstract class AbstractSimpleTransportTests { @Override public String executor() { - return ThreadPool.Names.CACHED; + return ThreadPool.Names.GENERIC; } @Override