diff options
33 files changed, 76 insertions, 53 deletions
diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/rpc/RPCCommunicator.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/rpc/RPCCommunicator.java index d8a72a9272c..4441501da01 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/rpc/RPCCommunicator.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/rpc/RPCCommunicator.java @@ -54,7 +54,7 @@ public class RPCCommunicator implements Communicator { private final int fleetControllerIndex; public static Supervisor createRealSupervisor() { - return new Supervisor(new Transport()); + return new Supervisor(new Transport("rpc-communicator")); } public RPCCommunicator(Supervisor supervisor, diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/rpc/RpcServer.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/rpc/RpcServer.java index bdce2b31036..519f4c2d171 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/rpc/RpcServer.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/rpc/RpcServer.java @@ -99,7 +99,7 @@ public class RpcServer { disconnect(); log.log(Level.FINE, "Fleetcontroller " + fleetControllerIndex + ": Connecting RPC server."); if (supervisor != null) disconnect(); - supervisor = new Supervisor(new Transport()); + supervisor = new Supervisor(new Transport("rpc" + port)); addMethods(); log.log(Level.FINE, "Fleetcontroller " + fleetControllerIndex + ": Attempting to bind to port " + port); acceptor = supervisor.listen(new Spec(port)); diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/rpc/SlobrokClient.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/rpc/SlobrokClient.java index c31fee36521..b3bb458ed74 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/rpc/SlobrokClient.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/rpc/SlobrokClient.java @@ -52,7 +52,7 @@ public class SlobrokClient implements NodeLookup { if (equalsExistingSpec(slobrokConnectionSpecs)) return; this.connectionSpecs = slobrokConnectionSpecs; shutdown(); - supervisor = new Supervisor(new Transport()); + supervisor = new Supervisor(new Transport("slobrok-client")); SlobrokList slist = new SlobrokList(); slist.setup(slobrokConnectionSpecs); mirror = new Mirror(supervisor, slist); diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ProxyServer.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ProxyServer.java index 4606ec7c072..68f89572503 100644 --- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ProxyServer.java +++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ProxyServer.java @@ -34,7 +34,7 @@ public class ProxyServer implements Runnable { private final static Logger log = Logger.getLogger(ProxyServer.class.getName()); private final AtomicBoolean signalCaught = new AtomicBoolean(false); - private final Supervisor supervisor = new Supervisor(new Transport(JRT_TRANSPORT_THREADS)); + private final Supervisor supervisor = new Supervisor(new Transport("proxy-server", JRT_TRANSPORT_THREADS)); private final ConfigProxyRpcServer rpcServer; private ConfigSourceSet configSource; diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/RpcConfigSourceClient.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/RpcConfigSourceClient.java index ba58c369afd..75866ec73ab 100644 --- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/RpcConfigSourceClient.java +++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/RpcConfigSourceClient.java @@ -41,7 +41,7 @@ class RpcConfigSourceClient implements ConfigSourceClient, Runnable { private final static Logger log = Logger.getLogger(RpcConfigSourceClient.class.getName()); private static final double timingValuesRatio = 0.8; - private final Supervisor supervisor = new Supervisor(new Transport()); + private final Supervisor supervisor = new Supervisor(new Transport("config-source-client")); private final RpcServer rpcServer; private final ConfigSourceSet configSourceSet; diff --git a/config/src/main/java/com/yahoo/vespa/config/JRTConnectionPool.java b/config/src/main/java/com/yahoo/vespa/config/JRTConnectionPool.java index 2c1d00f295e..9aeb1c9da0f 100644 --- a/config/src/main/java/com/yahoo/vespa/config/JRTConnectionPool.java +++ b/config/src/main/java/com/yahoo/vespa/config/JRTConnectionPool.java @@ -29,7 +29,7 @@ public class JRTConnectionPool implements ConnectionPool { private static final Logger log = Logger.getLogger(JRTConnectionPool.class.getName()); - private final Supervisor supervisor = new Supervisor(new Transport()); + private final Supervisor supervisor; private final Map<String, JRTConnection> connections = new LinkedHashMap<>(); // The config sources used by this connection pool. @@ -39,6 +39,7 @@ public class JRTConnectionPool implements ConnectionPool { private volatile JRTConnection currentConnection; public JRTConnectionPool(ConfigSourceSet sourceSet) { + supervisor = new Supervisor(new Transport("config-jrtpool-" + sourceSet.hashCode())); addSources(sourceSet); } diff --git a/config/src/main/java/com/yahoo/vespa/config/UrlDownloader.java b/config/src/main/java/com/yahoo/vespa/config/UrlDownloader.java index 2356b400343..5cc03c7deea 100644 --- a/config/src/main/java/com/yahoo/vespa/config/UrlDownloader.java +++ b/config/src/main/java/com/yahoo/vespa/config/UrlDownloader.java @@ -28,7 +28,7 @@ public class UrlDownloader { public static final int INTERNAL_ERROR = BASE_ERROR_CODE + 2; public static final int HTTP_ERROR = BASE_ERROR_CODE + 3; - private final Supervisor supervisor = new Supervisor(new Transport()); + private final Supervisor supervisor = new Supervisor(new Transport("url-downloader")); private final Spec spec; private Target target; diff --git a/config/src/main/java/com/yahoo/vespa/config/benchmark/LoadTester.java b/config/src/main/java/com/yahoo/vespa/config/benchmark/LoadTester.java index f20371d203c..8a0f24bcd48 100644 --- a/config/src/main/java/com/yahoo/vespa/config/benchmark/LoadTester.java +++ b/config/src/main/java/com/yahoo/vespa/config/benchmark/LoadTester.java @@ -43,7 +43,7 @@ import java.util.concurrent.ThreadLocalRandom; public class LoadTester { private static boolean debug = false; - private Transport transport = new Transport(); + private Transport transport = new Transport("rpc-client"); protected Supervisor supervisor = new Supervisor(transport); private List<ConfigKey<?>> configs = new ArrayList<>(); private Map<ConfigDefinitionKey, Tuple2<String, String[]>> defs = new HashMap<>(); diff --git a/config/src/main/java/com/yahoo/vespa/config/benchmark/StressTester.java b/config/src/main/java/com/yahoo/vespa/config/benchmark/StressTester.java index 0152c0bc3ff..6964e35abf6 100644 --- a/config/src/main/java/com/yahoo/vespa/config/benchmark/StressTester.java +++ b/config/src/main/java/com/yahoo/vespa/config/benchmark/StressTester.java @@ -168,7 +168,7 @@ public class StressTester { } public static class RpcServer implements Runnable { - private Transport transport = new Transport(); + private Transport transport = new Transport("rpc-server"); protected Supervisor supervisor = new Supervisor(transport); private final Spec spec; private final StressTester tester; diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/application/FileDistributionStatus.java b/configserver/src/main/java/com/yahoo/vespa/config/server/application/FileDistributionStatus.java index 092db354ffd..012d0d52275 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/application/FileDistributionStatus.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/application/FileDistributionStatus.java @@ -39,7 +39,7 @@ public class FileDistributionStatus extends AbstractComponent { enum Status {UNKNOWN, FINISHED, IN_PROGRESS} private final ExecutorService rpcExecutor = Executors.newCachedThreadPool(new DaemonThreadFactory("filedistribution status")); - private final Supervisor supervisor = new Supervisor(new Transport()); + private final Supervisor supervisor = new Supervisor(new Transport("filedistribution-status")); public StatusAllHosts status(Application application, Duration timeout) { List<HostStatus> hostStatuses = new ArrayList<>(); diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDistributionFactory.java b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDistributionFactory.java index ae18c3e6e95..fd71afedec1 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDistributionFactory.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDistributionFactory.java @@ -17,7 +17,7 @@ import java.io.File; public class FileDistributionFactory { protected final ConfigserverConfig configserverConfig; - private final Supervisor supervisor = new Supervisor(new Transport()); + private final Supervisor supervisor = new Supervisor(new Transport("filedistribution")); @Inject public FileDistributionFactory(ConfigserverConfig configserverConfig) { diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDistributionUtil.java b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDistributionUtil.java index 305bc71e66a..4ed93f0aa64 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDistributionUtil.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDistributionUtil.java @@ -87,7 +87,7 @@ public class FileDistributionUtil { public Supervisor getSupervisor() { synchronized (this) { if (supervisor == null) { - supervisor = new Supervisor(new Transport()); + supervisor = new Supervisor(new Transport("empty-connectionpool")); } } return supervisor; diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/RpcServer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/RpcServer.java index 388ddb4048c..2ebfd6a11d3 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/RpcServer.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/RpcServer.java @@ -82,7 +82,7 @@ public class RpcServer implements Runnable, ReloadListener, TenantListener { private static final long SHUTDOWN_TIMEOUT = 60; private static final int JRT_RPC_TRANSPORT_THREADS = threadsToUse(); - private final Supervisor supervisor = new Supervisor(new Transport(JRT_RPC_TRANSPORT_THREADS)); + private final Supervisor supervisor = new Supervisor(new Transport("rpc", JRT_RPC_TRANSPORT_THREADS)); private final Spec spec; private final boolean useRequestVersion; private final boolean hostedVespa; diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java b/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java index d600b9d3e04..e75c84376e0 100644 --- a/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java +++ b/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java @@ -164,7 +164,7 @@ public final class ConfiguredApplication implements Application { if ( ! qrConfig.rpc().enabled()) return null; // 1. Set up RPC server - supervisor = new Supervisor(new Transport()); + supervisor = new Supervisor(new Transport("slobrok")); Spec listenSpec = new Spec(qrConfig.rpc().port()); try { acceptor = supervisor.listen(listenSpec); diff --git a/container-search/src/main/java/com/yahoo/search/dispatch/rpc/RpcClient.java b/container-search/src/main/java/com/yahoo/search/dispatch/rpc/RpcClient.java index 52cb2b4c061..9ee455c48d3 100644 --- a/container-search/src/main/java/com/yahoo/search/dispatch/rpc/RpcClient.java +++ b/container-search/src/main/java/com/yahoo/search/dispatch/rpc/RpcClient.java @@ -25,8 +25,8 @@ class RpcClient implements Client { private final Supervisor supervisor; - public RpcClient(int transportThreads) { - supervisor = new Supervisor(new Transport(transportThreads)); + public RpcClient(String name, int transportThreads) { + supervisor = new Supervisor(new Transport(name, transportThreads)); } @Override diff --git a/container-search/src/main/java/com/yahoo/search/dispatch/rpc/RpcResourcePool.java b/container-search/src/main/java/com/yahoo/search/dispatch/rpc/RpcResourcePool.java index 065489ef9a0..aada16eef9b 100644 --- a/container-search/src/main/java/com/yahoo/search/dispatch/rpc/RpcResourcePool.java +++ b/container-search/src/main/java/com/yahoo/search/dispatch/rpc/RpcResourcePool.java @@ -45,7 +45,7 @@ public class RpcResourcePool extends AbstractComponent { @Inject public RpcResourcePool(DispatchConfig dispatchConfig) { super(); - var client = new RpcClient(dispatchConfig.numJrtTransportThreads()); + var client = new RpcClient("dispatch-client", dispatchConfig.numJrtTransportThreads()); // Create rpc node connection pools indexed by the node distribution key var builder = new ImmutableMap.Builder<Integer, NodeConnectionPool>(); diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/ExternPolicy.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/ExternPolicy.java index e000364e0d4..030a0d2588c 100755 --- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/ExternPolicy.java +++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/ExternPolicy.java @@ -58,7 +58,7 @@ public class ExternPolicy implements DocumentProtocolRoutingPolicy { slobroks.setup(args[0].split(",")); pattern = args[1]; session = pattern.substring(pos); - orb = new Supervisor(new Transport()); + orb = new Supervisor(new Transport("externpolicy")); mirror = new Mirror(orb, slobroks); error = null; } diff --git a/fileacquirer/src/main/java/com/yahoo/filedistribution/fileacquirer/FileAcquirerImpl.java b/fileacquirer/src/main/java/com/yahoo/filedistribution/fileacquirer/FileAcquirerImpl.java index 32c381c1e38..6f104ad6fc5 100644 --- a/fileacquirer/src/main/java/com/yahoo/filedistribution/fileacquirer/FileAcquirerImpl.java +++ b/fileacquirer/src/main/java/com/yahoo/filedistribution/fileacquirer/FileAcquirerImpl.java @@ -36,7 +36,7 @@ class FileAcquirerImpl implements FileAcquirer { private static final Logger log = Logger.getLogger(FileAcquirerImpl.class.getName()); - private final Supervisor supervisor = new Supervisor(new Transport()); + private final Supervisor supervisor = new Supervisor(new Transport("fileaquirer")); private final ConfigSubscriber configSubscriber; private class Connection implements ConfigSubscriber.SingleSubscriber<FiledistributorrpcConfig> { diff --git a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/RpcTester.java b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/RpcTester.java index 4e0d5e4e32a..4d49c93db53 100644 --- a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/RpcTester.java +++ b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/RpcTester.java @@ -52,7 +52,7 @@ public class RpcTester { log.log(Level.INFO, "Read blob from " + file.getAbsolutePath()); - Supervisor supervisor = new Supervisor(new Transport()); + Supervisor supervisor = new Supervisor(new Transport("rpctester")); Spec spec = new Spec("tcp/localhost:19090"); log.log(Level.INFO, "Connecting to " + spec); diff --git a/jrt/src/com/yahoo/jrt/Transport.java b/jrt/src/com/yahoo/jrt/Transport.java index 02a6e3e05f7..003e40b8aa9 100644 --- a/jrt/src/com/yahoo/jrt/Transport.java +++ b/jrt/src/com/yahoo/jrt/Transport.java @@ -20,6 +20,7 @@ public class Transport { private static final Logger log = Logger.getLogger(Transport.class.getName()); + private final String name; private final FatalErrorHandler fatalHandler; // NB: this must be set first private final CryptoEngine cryptoEngine; private final Connector connector; @@ -37,11 +38,13 @@ public class Transport { * error handler is registered, the default action is to log the * error and exit with exit code 1. * + * @param name used for identifying threads * @param fatalHandler fatal error handler * @param cryptoEngine crypto engine to use * @param numThreads number of {@link TransportThread}s. **/ - public Transport(FatalErrorHandler fatalHandler, CryptoEngine cryptoEngine, int numThreads, boolean tcpNoDelay) { + public Transport(String name, FatalErrorHandler fatalHandler, CryptoEngine cryptoEngine, int numThreads, boolean tcpNoDelay) { + this.name = name; this.fatalHandler = fatalHandler; // NB: this must be set first this.cryptoEngine = cryptoEngine; this.tcpNoDelay = tcpNoDelay; @@ -49,13 +52,15 @@ public class Transport { worker = new Worker(this); runCnt = new AtomicInteger(numThreads); for (int i = 0; i < numThreads; ++i) { - threads.add(new TransportThread(this)); + threads.add(new TransportThread(this, i)); } } - public Transport(CryptoEngine cryptoEngine, int numThreads) { this(null, cryptoEngine, numThreads, true); } - public Transport(int numThreads) { this(null, CryptoEngine.createDefault(), numThreads, true); } - public Transport(int numThreads, boolean tcpNoDelay) { this(null, CryptoEngine.createDefault(), numThreads, tcpNoDelay); } - public Transport() { this(null, CryptoEngine.createDefault(), 1, true); } + public Transport(String name, CryptoEngine cryptoEngine, int numThreads) { this(name, null, cryptoEngine, numThreads, true); } + public Transport(String name, int numThreads) { this(name, null, CryptoEngine.createDefault(), numThreads, true); } + public Transport(String name, int numThreads, boolean tcpNoDelay) { this(name, null, CryptoEngine.createDefault(), numThreads, tcpNoDelay); } + public Transport(String name) { this(name, null, CryptoEngine.createDefault(), 1, true); } + // Only for testing + public Transport() { this("default"); } /** * Select a random transport thread @@ -68,6 +73,8 @@ public class Transport { boolean getTcpNoDelay() { return tcpNoDelay; } + String getName() { return name; } + /** * Use the underlying CryptoEngine to create a CryptoSocket for * the client side of a connection. diff --git a/jrt/src/com/yahoo/jrt/TransportThread.java b/jrt/src/com/yahoo/jrt/TransportThread.java index bb41e67c3f1..8f158161888 100644 --- a/jrt/src/com/yahoo/jrt/TransportThread.java +++ b/jrt/src/com/yahoo/jrt/TransportThread.java @@ -167,9 +167,9 @@ public class TransportThread { return true; } - TransportThread(Transport transport) { + TransportThread(Transport transport, int index) { parent = transport; - thread = new Thread(new Run(), "<jrt-transport>"); + thread = new Thread(new Run(), transport.getName() + ".jrt-transport." + index); queue = new Queue(); myQueue = new Queue(); scheduler = new Scheduler(System.currentTimeMillis()); diff --git a/jrt/src/com/yahoo/jrt/Worker.java b/jrt/src/com/yahoo/jrt/Worker.java index 39c0e6773b2..d20ebadf856 100644 --- a/jrt/src/com/yahoo/jrt/Worker.java +++ b/jrt/src/com/yahoo/jrt/Worker.java @@ -40,13 +40,13 @@ class Worker { private static void preloadClassRequiredAtShutDown() { new CloseSocket(null); } - - private Thread thread = new Thread(new Run(), "<jrt-worker>"); - private Transport parent; - private ThreadQueue workQueue = new ThreadQueue(); + private final Thread thread; + private final Transport parent; + private final ThreadQueue workQueue = new ThreadQueue(); public Worker(Transport parent) { preloadClassRequiredAtShutDown(); + thread = new Thread(new Run(), parent.getName() + ".jrt-worker"); this.parent = parent; thread.setDaemon(true); thread.start(); diff --git a/jrt/src/com/yahoo/jrt/slobrok/server/Slobrok.java b/jrt/src/com/yahoo/jrt/slobrok/server/Slobrok.java index 6ce8f3d1227..f19779732ba 100644 --- a/jrt/src/com/yahoo/jrt/slobrok/server/Slobrok.java +++ b/jrt/src/com/yahoo/jrt/slobrok/server/Slobrok.java @@ -1,7 +1,21 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.jrt.slobrok.server; -import com.yahoo.jrt.*; +import com.yahoo.jrt.Acceptor; +import com.yahoo.jrt.ErrorCode; +import com.yahoo.jrt.Int32Value; +import com.yahoo.jrt.ListenFailedException; +import com.yahoo.jrt.Method; +import com.yahoo.jrt.MethodHandler; +import com.yahoo.jrt.Request; +import com.yahoo.jrt.RequestWaiter; +import com.yahoo.jrt.Spec; +import com.yahoo.jrt.StringArray; +import com.yahoo.jrt.Supervisor; +import com.yahoo.jrt.Target; +import com.yahoo.jrt.TargetWatcher; +import com.yahoo.jrt.Task; +import com.yahoo.jrt.Transport; import java.util.ArrayList; import java.util.HashMap; @@ -10,11 +24,11 @@ import java.util.Map; public class Slobrok { - Supervisor orb; - Acceptor listener; + Supervisor orb; + Acceptor listener; private Map<String,String> services = new HashMap<>(); List<FetchMirror> pendingFetch = new ArrayList<>(); - Map<String,Target> targets = new HashMap<>(); + Map<String, Target> targets = new HashMap<>(); TargetMonitor monitor = new TargetMonitor(); int gencnt = 1; @@ -25,7 +39,7 @@ public class Slobrok { public Slobrok(int port) throws ListenFailedException { // NB: rpc must be single-threaded - orb = new Supervisor(new Transport(1)); + orb = new Supervisor(new Transport("slobrok-" + port, 1)); registerMethods(); try { listener = orb.listen(new Spec(port)); @@ -241,7 +255,7 @@ public class Slobrok { private class FetchMirror implements Runnable { public final Request req; - public final Task task; + public final Task task; public FetchMirror(Request req, int timeout) { req.detach(); diff --git a/jrt/src/com/yahoo/jrt/tool/RpcInvoker.java b/jrt/src/com/yahoo/jrt/tool/RpcInvoker.java index 6c36e8f9604..8f0702a9ecc 100644 --- a/jrt/src/com/yahoo/jrt/tool/RpcInvoker.java +++ b/jrt/src/com/yahoo/jrt/tool/RpcInvoker.java @@ -77,7 +77,7 @@ public class RpcInvoker { if (connectspec.indexOf('/') < 0) connectspec = "tcp/" + connectspec; - supervisor = new Supervisor(new Transport()); + supervisor = new Supervisor(new Transport("invoker")); target = supervisor.connect(new Spec(connectspec)); Request request = createRequest(method,arguments); target.invokeSync(request,10.0); diff --git a/jrt/tests/com/yahoo/jrt/EchoTest.java b/jrt/tests/com/yahoo/jrt/EchoTest.java index 97139fd60ab..c71eae78ad9 100644 --- a/jrt/tests/com/yahoo/jrt/EchoTest.java +++ b/jrt/tests/com/yahoo/jrt/EchoTest.java @@ -91,8 +91,8 @@ public class EchoTest { public void setUp() throws ListenFailedException { metrics = TransportMetrics.getInstance(); startSnapshot = metrics.snapshot(); - server = new Supervisor(new Transport(crypto, 1)); - client = new Supervisor(new Transport(crypto, 1)); + server = new Supervisor(new Transport("server", crypto, 1)); + client = new Supervisor(new Transport("client", crypto, 1)); acceptor = server.listen(new Spec(0)); target = client.connect(new Spec("localhost", acceptor.port())); server.addMethod(new Method("echo", "*", "*", this::rpc_echo)); diff --git a/jrt/tests/com/yahoo/jrt/LatencyTest.java b/jrt/tests/com/yahoo/jrt/LatencyTest.java index 97d7affd6ea..c8ead8ebf77 100644 --- a/jrt/tests/com/yahoo/jrt/LatencyTest.java +++ b/jrt/tests/com/yahoo/jrt/LatencyTest.java @@ -18,8 +18,8 @@ public class LatencyTest { private final Supervisor client; private final Acceptor acceptor; public Network(CryptoEngine crypto, int threads) throws ListenFailedException { - server = new Supervisor(new Transport(crypto, threads)); - client = new Supervisor(new Transport(crypto, threads)); + server = new Supervisor(new Transport("server", crypto, threads)); + client = new Supervisor(new Transport("client", crypto, threads)); server.addMethod(new Method("inc", "i", "i", this::rpc_inc)); acceptor = server.listen(new Spec(0)); } diff --git a/jrt/tests/com/yahoo/jrt/SessionTest.java b/jrt/tests/com/yahoo/jrt/SessionTest.java index 29d6bb21d5f..b6568c2f283 100644 --- a/jrt/tests/com/yahoo/jrt/SessionTest.java +++ b/jrt/tests/com/yahoo/jrt/SessionTest.java @@ -122,13 +122,12 @@ public class SessionTest implements SessionHandler { @Before public void setUp() throws ListenFailedException { Session.reset(); - server = new Test.Orb(new Transport(crypto, 1)); + server = new Test.Orb(new Transport("server", crypto, 1)); server.setSessionHandler(this); - client = new Test.Orb(new Transport(crypto, 1)); + client = new Test.Orb(new Transport("client", crypto, 1)); client.setSessionHandler(this); acceptor = server.listen(new Spec(0)); - target = client.connect(new Spec("localhost", acceptor.port()), - new Session()); + target = client.connect(new Spec("localhost", acceptor.port()), new Session()); server.addMethod(new Method("set", "i", "", this::rpc_set)); server.addMethod(new Method("get", "", "i", this::rpc_get)); diff --git a/logserver/src/main/java/ai/vespa/logserver/protocol/RpcServer.java b/logserver/src/main/java/ai/vespa/logserver/protocol/RpcServer.java index b3860da6fb7..80cc9ce0e94 100644 --- a/logserver/src/main/java/ai/vespa/logserver/protocol/RpcServer.java +++ b/logserver/src/main/java/ai/vespa/logserver/protocol/RpcServer.java @@ -15,11 +15,12 @@ import com.yahoo.jrt.Transport; */ public class RpcServer implements AutoCloseable { - private final Supervisor supervisor = new Supervisor(new Transport()); + private final Supervisor supervisor; private final int listenPort; private Acceptor acceptor; public RpcServer(int listenPort) { + supervisor = new Supervisor(new Transport("logserver-" + listenPort)); this.listenPort = listenPort; } diff --git a/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCNetwork.java b/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCNetwork.java index 554977d7eb1..5a7ca9c6f1a 100644 --- a/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCNetwork.java +++ b/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCNetwork.java @@ -87,7 +87,7 @@ public class RPCNetwork implements Network, MethodHandler { public RPCNetwork(RPCNetworkParams params, SlobrokConfigSubscriber slobrokConfig) { this.slobroksConfig = slobrokConfig; identity = params.getIdentity(); - orb = new Supervisor(new Transport(params.getNumNetworkThreads(), shouldEnableTcpNodelay(params.getOptimization()))); + orb = new Supervisor(new Transport("mbus-rpc-" + identity.getServicePrefix(), params.getNumNetworkThreads(), shouldEnableTcpNodelay(params.getOptimization()))); orb.setMaxInputBufferSize(params.getMaxInputBufferSize()); orb.setMaxOutputBufferSize(params.getMaxOutputBufferSize()); targetPool = new RPCTargetPool(params.getConnectionExpireSecs(), params.getNumTargetsPerSpec()); diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/rpc/RpcConnector.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/rpc/RpcConnector.java index c09dc44d3fd..c9d4ad2a5ac 100644 --- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/rpc/RpcConnector.java +++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/rpc/RpcConnector.java @@ -23,10 +23,11 @@ import static java.util.logging.Level.INFO; public class RpcConnector extends AbstractComponent { private static final Logger log = Logger.getLogger(RpcConnector.class.getName()); - private final Supervisor supervisor = new Supervisor(new Transport()); + private final Supervisor supervisor; private final Acceptor acceptor; public RpcConnector(RpcConnectorConfig config) { + supervisor = new Supervisor(new Transport("rpc-" + config.port())); Spec spec = new Spec(config.port()); try { acceptor = supervisor.listen(spec); diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/ConfigSentinelClient.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/ConfigSentinelClient.java index c0e3e636aa6..1fd444332d6 100644 --- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/ConfigSentinelClient.java +++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/ConfigSentinelClient.java @@ -24,7 +24,7 @@ import java.util.logging.Logger; public class ConfigSentinelClient extends AbstractComponent { private final static Logger log = Logger.getLogger(ConfigSentinelClient.class.getName()); - private final Supervisor supervisor = new Supervisor(new Transport()); + private final Supervisor supervisor = new Supervisor(new Transport("sentinel-client")); @Inject public ConfigSentinelClient() { diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/slobrok/SlobrokMonitor.java b/service-monitor/src/main/java/com/yahoo/vespa/service/slobrok/SlobrokMonitor.java index 1a402419ac0..62f39084272 100644 --- a/service-monitor/src/main/java/com/yahoo/vespa/service/slobrok/SlobrokMonitor.java +++ b/service-monitor/src/main/java/com/yahoo/vespa/service/slobrok/SlobrokMonitor.java @@ -37,7 +37,7 @@ public class SlobrokMonitor implements AutoCloseable { } private SlobrokMonitor(SlobrokList slobrokList) { - this(slobrokList, new Mirror(new Supervisor(new Transport()), slobrokList)); + this(slobrokList, new Mirror(new Supervisor(new Transport("slobrok-monitor")), slobrokList)); } void updateSlobrokList(ApplicationInfo application) { diff --git a/vespaclient-java/src/main/java/com/yahoo/vespasummarybenchmark/VespaSummaryBenchmark.java b/vespaclient-java/src/main/java/com/yahoo/vespasummarybenchmark/VespaSummaryBenchmark.java index c47ffb241d2..fbfb16dd021 100644 --- a/vespaclient-java/src/main/java/com/yahoo/vespasummarybenchmark/VespaSummaryBenchmark.java +++ b/vespaclient-java/src/main/java/com/yahoo/vespasummarybenchmark/VespaSummaryBenchmark.java @@ -41,7 +41,7 @@ import java.util.List; */ public class VespaSummaryBenchmark { - private final Supervisor supervisor = new Supervisor(new Transport()); + private final Supervisor supervisor = new Supervisor(new Transport("client")); private static final LZ4Factory lz4Factory = LZ4Factory.fastestInstance(); private VespaSummaryBenchmark() { } |