diff options
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainer.java | 14 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/container/Container.java | 37 |
2 files changed, 16 insertions, 35 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainer.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainer.java index cbfbe0d191e..8dff6aeb830 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainer.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainer.java @@ -85,10 +85,12 @@ public class MetricsProxyContainer extends Container implements throw new IllegalArgumentException("unexpected HTTP setup"); } allocatedSearchPort = from.wantPort(start++, "http"); + portsMeta.on(0).tag("http").tag("query").tag("external").tag("state"); + // XXX remove: from.wantPort(start++, "http/1"); - // XXX change to 1: - numHttpServerPorts = 2; + portsMeta.on(1).tag("unused"); + if (numMessageBusPorts() != 0) { throw new IllegalArgumentException("expecting 0 message bus ports"); } @@ -96,7 +98,9 @@ public class MetricsProxyContainer extends Container implements throw new IllegalArgumentException("expecting 1 rpc port"); } allocatedRpcPort = from.wantPort(start++, "rpc/admin"); + portsMeta.on(2).tag("rpc").tag("admin"); metricsRpcPort = from.wantPort(start++, "rpc/metrics"); + portsMeta.on(3).tag("rpc").tag("metrics"); } @Override @@ -105,12 +109,6 @@ public class MetricsProxyContainer extends Container implements } @Override - protected void tagServers() { - super.tagServers(); - portsMeta.on(3).tag("rpc").tag("metrics"); - } - - @Override public void getConfig(RpcConnectorConfig.Builder builder) { builder.port(metricsRpcPort); } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java b/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java index 3f964069abc..c1e644ba524 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java @@ -75,8 +75,6 @@ public abstract class Container extends AbstractService implements private final JettyHttpServer defaultHttpServer = new JettyHttpServer(new ComponentId("DefaultHttpServer")); - protected int numHttpServerPorts = 0; - protected Container(AbstractConfigProducer parent, String name, int index) { this(parent, name, false, index); } @@ -158,24 +156,6 @@ public abstract class Container extends AbstractService implements if (getHttp() == null) { initDefaultJettyConnector(); } - - tagServers(); - } - - protected void tagServers() { - int offset = 0; - if (numHttpServerPorts > 0) { - portsMeta.on(offset++).tag("http").tag("query").tag("external").tag("state"); - } - for (int i = 1; i < numHttpServerPorts; i++) - portsMeta.on(offset++).tag("http").tag("external"); - - if (messageBusEnabled()) { - portsMeta.on(offset++).tag("rpc").tag("messaging"); - } - if (rpcServerEnabled()) { - portsMeta.on(offset++).tag("rpc").tag("admin"); - } } private int getPort(ConnectorFactory connectorFactory) { @@ -233,35 +213,38 @@ public abstract class Container extends AbstractService implements @Override public void allocatePorts(int start, PortAllocBridge from) { if (start == 0) start = BASEPORT; - int off = 2; + int offset = 0; if (getHttp() == null) { if (requireSpecificPorts) { allocatedSearchPort = from.requirePort(start, "http"); } else { allocatedSearchPort = from.allocatePort("http"); } + portsMeta.on(offset++).tag("http").tag("query").tag("external").tag("state"); // XXX unused - remove: from.allocatePort("http/1"); - // XXX change to 1: - numHttpServerPorts = 2; + portsMeta.on(offset++).tag("http").tag("external"); } else if (getHttp().getHttpServer() == null) { // no http server ports - numHttpServerPorts = 0; } else { for (ConnectorFactory connectorFactory : getHttp().getHttpServer().getConnectorFactories()) { int port = getPort(connectorFactory); String name = "http/" + connectorFactory.getName(); from.requirePort(port, name); - ++numHttpServerPorts; + if (offset == 0) { + portsMeta.on(offset++).tag("http").tag("query").tag("external").tag("state"); + } else { + portsMeta.on(offset++).tag("http").tag("external"); + } } } if (messageBusEnabled()) { allocatedMessagingPort = from.allocatePort("messaging"); - ++off; + portsMeta.on(offset++).tag("rpc").tag("messaging"); } if (rpcServerEnabled()) { allocatedRpcPort = from.allocatePort("rpc/admin"); - ++off; + portsMeta.on(offset++).tag("rpc").tag("admin"); } } |