diff options
5 files changed, 4 insertions, 59 deletions
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 401e4be9956..dc962ed5931 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 @@ -70,27 +70,18 @@ public class Container extends AbstractService implements private final JettyHttpServer defaultHttpServer = new JettyHttpServer(new ComponentId("DefaultHttpServer")); - private final List<PortOverride> portOverrides; - private final int numHttpServerPorts; private static final int numRpcServerPorts = 2; private static final String defaultHostedJVMArgs = "-XX:+UseOSErrorReporting -XX:+SuppressFatalErrorMessage"; public Container(AbstractConfigProducer parent, String name, int index, boolean isHostedVespa) { - this(parent, name, Collections.emptyList(), index, isHostedVespa); + this(parent, name, false, index, isHostedVespa); } public Container(AbstractConfigProducer parent, String name, boolean retired, int index, boolean isHostedVespa) { - this(parent, name, retired, Collections.emptyList(), index, isHostedVespa); - } - public Container(AbstractConfigProducer parent, String name, List<PortOverride> portOverrides, int index, boolean isHostedVespa) { - this(parent, name, false, portOverrides, index, isHostedVespa); - } - public Container(AbstractConfigProducer parent, String name, boolean retired, List<PortOverride> portOverrides, int index, boolean isHostedVespa) { super(parent, name); this.name = name; this.parent = parent; this.isHostedVespa = isHostedVespa; - this.portOverrides = Collections.unmodifiableList(new ArrayList<>(portOverrides)); this.retired = retired; this.index = index; @@ -183,18 +174,12 @@ public class Container extends AbstractService implements private void reserveHttpPortsPrepended() { if (getHttp().getHttpServer() != null) { for (ConnectorFactory connectorFactory : getHttp().getHttpServer().getConnectorFactories()) { - reservePortPrepended(getPort(connectorFactory, portOverrides)); + reservePortPrepended(getPort(connectorFactory)); } } } - private int getPort(ConnectorFactory connectorFactory, List<PortOverride> portOverrides) { - ComponentId id = ComponentId.fromString(connectorFactory.getName()); - for (PortOverride override : portOverrides) { - if (override.serverId.matches(id)) { - return override.port; - } - } + private int getPort(ConnectorFactory connectorFactory) { return connectorFactory.getListenPort(); } @@ -396,16 +381,6 @@ public class Container extends AbstractService implements return containerCluster().isPresent() && containerCluster().get().rpcServerEnabled(); } - public static final class PortOverride { - public final ComponentSpecification serverId; - public final int port; - - public PortOverride(ComponentSpecification serverId, int port) { - this.serverId = serverId; - this.port = port; - } - } - private Optional<ContainerCluster> containerCluster() { return (parent instanceof ContainerCluster) ? Optional.of((ContainerCluster) parent) : Optional.empty(); } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerServiceBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerServiceBuilder.java index 43bc5fbfe65..fb3e39fc644 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerServiceBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerServiceBuilder.java @@ -30,19 +30,7 @@ public class ContainerServiceBuilder extends VespaDomBuilder.DomConfigProducerBu @Override protected Container doBuild(DeployState deployState, AbstractConfigProducer parent, Element nodeElem) { - return new Container(parent, id, readServerPortOverrides(nodeElem), index, deployState.isHosted()); + return new Container(parent, id, index, deployState.isHosted()); } - private List<Container.PortOverride> readServerPortOverrides(Element spec) { - List<Container.PortOverride> portOverrides = new ArrayList<>(); - - for (Element serverPort: XML.getChildren(spec, "server-port")) { - ComponentSpecification serverId = XmlHelper.getIdRef(serverPort); - int port = Integer.parseInt(serverPort.getAttribute("port")); - - portOverrides.add(new Container.PortOverride(serverId, port)); - } - - return portOverrides; - } } diff --git a/config-model/src/main/resources/schema/containercluster.rnc b/config-model/src/main/resources/schema/containercluster.rnc index 5ac5a0817b6..6bc54c433f3 100644 --- a/config-model/src/main/resources/schema/containercluster.rnc +++ b/config-model/src/main/resources/schema/containercluster.rnc @@ -237,16 +237,11 @@ NodesOfContainerCluster = element nodes { element node { attribute hostalias { xsd:NCName } & attribute cpu-socket { xsd:positiveInteger }? & - ServerPort* & GenericConfig* }+ ) } -ServerPort = element server-port { - ComponentId & - attribute port { xsd:positiveInteger } -} #DOCUMENT BINDINGS: diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java index 7824149f92d..26820672f2c 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java @@ -516,21 +516,11 @@ public class ContainerModelBuilderTest extends ContainerModelBuilderTestBase { " </http>", " <nodes cpu-socket-affinity='true'>", " <node hostalias='node1' />", - " <node hostalias='node2'> <server-port id='main' port='5080'/> </node>", - " <node hostalias='node3'> <server-port id='main' port='6080'/> </node>", - " <node hostalias='node4'> <server-port id='main' port='7080'/> </node>", " </nodes>" + "</jdisc>"); createModel(root, clusterElem); assertTrue(getContainerCluster("default").getContainers().get(0).getAffinity().isPresent()); - assertTrue(getContainerCluster("default").getContainers().get(1).getAffinity().isPresent()); - assertTrue(getContainerCluster("default").getContainers().get(2).getAffinity().isPresent()); - assertTrue(getContainerCluster("default").getContainers().get(3).getAffinity().isPresent()); - assertThat(getContainerCluster("default").getContainers().get(0).getAffinity().get().cpuSocket(), is(0)); - assertThat(getContainerCluster("default").getContainers().get(1).getAffinity().get().cpuSocket(), is(1)); - assertThat(getContainerCluster("default").getContainers().get(2).getAffinity().get().cpuSocket(), is(2)); - assertThat(getContainerCluster("default").getContainers().get(3).getAffinity().get().cpuSocket(), is(3)); } @Test diff --git a/config-model/src/test/schema-test-files/services.xml b/config-model/src/test/schema-test-files/services.xml index 13612a91726..40a2b31b3fc 100644 --- a/config-model/src/test/schema-test-files/services.xml +++ b/config-model/src/test/schema-test-files/services.xml @@ -210,9 +210,6 @@ <TEST_VAR>7</TEST_VAR> </environment-variables> <node hostalias="host1" /> - <node hostalias="host1"> - <server-port id="myServer" port="4090" /> - </node> </nodes> </container> |