diff options
author | Harald Musum <musum@yahooinc.com> | 2022-09-20 12:36:01 +0200 |
---|---|---|
committer | Harald Musum <musum@yahooinc.com> | 2022-09-20 12:36:01 +0200 |
commit | fb8e352681560ca139295d7e0b2251734cbdfeef (patch) | |
tree | ee54ac6d1553d2c79bfd23baf40aaae8ca0ff418 | |
parent | 5b894c7ae68032ad490a4c236c915be92f9b6c9d (diff) |
No need to call disconnect twice
-rw-r--r-- | clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/rpc/RpcServer.java | 12 |
1 files changed, 2 insertions, 10 deletions
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 06f6777ab80..5bc4e344ec3 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 @@ -96,22 +96,15 @@ public class RpcServer { public void connect() throws ListenFailedException, UnknownHostException { disconnect(); - log.log(Level.FINE, () -> "Fleetcontroller " + fleetControllerIndex + ": Connecting RPC server."); - if (supervisor != null) disconnect(); supervisor = new Supervisor(new Transport("rpc" + port)).setDropEmptyBuffers(true); addMethods(); - log.log(Level.FINE, () -> "Fleetcontroller " + fleetControllerIndex + ": Attempting to bind to port " + port); + log.log(Level.FINE, () -> "Fleetcontroller " + fleetControllerIndex + ": RPC server attempting to bind to port " + port); acceptor = supervisor.listen(new Spec(port)); log.log(Level.FINE, () -> "Fleetcontroller " + fleetControllerIndex + ": RPC server listening to port " + acceptor.port()); - StringBuilder slobroks = new StringBuilder("("); - for (String s : slobrokConnectionSpecs) { - slobroks.append(" ").append(s); - } - slobroks.append(" )"); SlobrokList slist = new SlobrokList(); slist.setup(slobrokConnectionSpecs); Spec spec = new Spec(HostName.getLocalhost(), acceptor.port()); - log.log(Level.INFO, "Registering " + spec + " with slobrok at " + slobroks); + log.log(Level.INFO, "Registering " + spec + " with slobrok at " + String.join(" ", slobrokConnectionSpecs)); if (slobrokBackOffPolicy != null) { register = new Register(supervisor, slist, spec, slobrokBackOffPolicy); } else { @@ -136,7 +129,6 @@ public class RpcServer { } } - public void addMethods() { Method m = new Method("getMaster", "", "is", this::queueRpcRequest); m.methodDesc("Get index of current fleetcontroller master"); |