diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2019-10-24 22:32:08 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2019-10-24 22:32:08 +0200 |
commit | 093c4c57f0ba5a1380b13b109bd131c7b05f55dc (patch) | |
tree | 6e4b8b4b5d2f5c477099d6bf3a3d95412b1a34cb /config-model/src/main | |
parent | de4ebbee046517bc5f076e4977d6f56d9fcdb383 (diff) |
GC no longer used ports.
Diffstat (limited to 'config-model/src/main')
4 files changed, 8 insertions, 30 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/IndexedSearchCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/search/IndexedSearchCluster.java index 40cc09938e2..7d03a7acee7 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/search/IndexedSearchCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/search/IndexedSearchCluster.java @@ -346,7 +346,6 @@ public class IndexedSearchCluster extends SearchCluster nodeBuilder.group(node.getNodeSpec().groupIndex()); nodeBuilder.host(node.getHostName()); nodeBuilder.port(node.getRpcPort()); - nodeBuilder.fs4port(node.getDispatchPort()); builder.node(nodeBuilder); } if (useAdaptiveDispatch) diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/SearchInterface.java b/config-model/src/main/java/com/yahoo/vespa/model/search/SearchInterface.java index c7d69b6818a..7a3fc7dd715 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/search/SearchInterface.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/search/SearchInterface.java @@ -10,7 +10,6 @@ package com.yahoo.vespa.model.search; public interface SearchInterface { NodeSpec getNodeSpec(); - String getDispatcherConnectSpec(); String getHostName(); } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/SearchNode.java b/config-model/src/main/java/com/yahoo/vespa/model/search/SearchNode.java index fe1a61086f2..a174e7c38e8 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/search/SearchNode.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/search/SearchNode.java @@ -64,8 +64,8 @@ public class SearchNode extends AbstractService implements private final Optional<Tuning> tuning; private final Optional<ResourceLimits> resourceLimits; private static final int RPC_PORT = 0; - private static final int FS4_PORT = 1; - private static final int FUTURE_HEALTH_PORT = 2; + private static final int UNUSED_1 = 1; + private static final int UNUSED_2 = 2; private static final int UNUSED_3 = 3; private static final int HEALTH_PORT = 4; @@ -123,8 +123,8 @@ public class SearchNode extends AbstractService implements this.clusterName = clusterName; this.flushOnShutdown = flushOnShutdown; portsMeta.on(RPC_PORT).tag("rpc").tag("rtc").tag("admin").tag("status"); - portsMeta.on(FS4_PORT).tag("fs4"); - portsMeta.on(FUTURE_HEALTH_PORT).tag("unused"); + portsMeta.on(UNUSED_1).tag("unused"); + portsMeta.on(UNUSED_2).tag("unused"); portsMeta.on(UNUSED_3).tag("unused"); portsMeta.on(HEALTH_PORT).tag("http").tag("json").tag("health").tag("state"); // Properties are set in DomSearchBuilder @@ -156,7 +156,7 @@ public class SearchNode extends AbstractService implements this.redundancy = redundancy; } - public void updatePartition(int partitionId) { + void updatePartition(int partitionId) { nodeSpec = new NodeSpec(nodeSpec.groupIndex(), partitionId); } @@ -169,8 +169,8 @@ public class SearchNode extends AbstractService implements public void allocatePorts(int start, PortAllocBridge from) { // NB: ignore "start" from.allocatePort("rpc"); - from.allocatePort("fs4"); - from.allocatePort("future/4"); + from.allocatePort("unused/1"); + from.allocatePort("unused/2"); from.allocatePort("unused/3"); from.allocatePort("health"); } @@ -208,20 +208,6 @@ public class SearchNode extends AbstractService implements return distributionKey; } - /** - * Returns the connection spec string that resolves to the dispatcher service - * on this node. - * - * @return The connection string. - */ - public String getDispatcherConnectSpec() { - return "tcp/" + getHost().getHostname() + ":" + getDispatchPort(); - } - - public int getDispatchPort() { - return getRelativePort(FS4_PORT); - } - private int getHttpPort() { return getRelativePort(HEALTH_PORT); } @@ -236,7 +222,7 @@ public class SearchNode extends AbstractService implements return getHostName(); } - public TransactionLogServer getTransactionLogServer() { + private TransactionLogServer getTransactionLogServer() { return tls; } @@ -269,7 +255,6 @@ public class SearchNode extends AbstractService implements @Override public void getConfig(ProtonConfig.Builder builder) { builder. - ptport(getDispatchPort()). rpcport(getRpcPort()). httpport(getHttpPort()). partition(getNodeSpec().partitionId()). diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/SearchNodeWrapper.java b/config-model/src/main/java/com/yahoo/vespa/model/search/SearchNodeWrapper.java index fea3285e9a0..73feb0d3a16 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/search/SearchNodeWrapper.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/search/SearchNodeWrapper.java @@ -17,11 +17,6 @@ public class SearchNodeWrapper implements SearchInterface { } @Override - public String getDispatcherConnectSpec() { - return node.getDispatcherConnectSpec(); - } - - @Override public String getHostName() { return node.getHostName(); } |