diff options
5 files changed, 10 insertions, 25 deletions
diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/ConfigServerSpec.java b/config-model-api/src/main/java/com/yahoo/config/model/api/ConfigServerSpec.java index 853c446a1c6..e63e4ce3af6 100644 --- a/config-model-api/src/main/java/com/yahoo/config/model/api/ConfigServerSpec.java +++ b/config-model-api/src/main/java/com/yahoo/config/model/api/ConfigServerSpec.java @@ -10,7 +10,8 @@ public interface ConfigServerSpec { String getHostName(); int getConfigServerPort(); - int getHttpPort(); + // TODO: Remove when latest model version in use is 7.47 + default int getHttpPort() { return getConfigServerPort() + 1; } int getZooKeeperPort(); } diff --git a/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java b/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java index fe6d683adf8..4b35af53154 100644 --- a/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java +++ b/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java @@ -96,7 +96,6 @@ public class TestProperties implements ModelContext.Properties { private final String hostName; private final int configServerPort; - private final int httpPort; private final int zooKeeperPort; public String getHostName() { @@ -107,10 +106,6 @@ public class TestProperties implements ModelContext.Properties { return configServerPort; } - public int getHttpPort() { - return httpPort; - } - public int getZooKeeperPort() { return zooKeeperPort; } @@ -122,7 +117,6 @@ public class TestProperties implements ModelContext.Properties { return hostName.equals(other.getHostName()) && configServerPort == other.getConfigServerPort() && - httpPort == other.getHttpPort() && zooKeeperPort == other.getZooKeeperPort(); } else { return false; @@ -134,10 +128,9 @@ public class TestProperties implements ModelContext.Properties { return hostName.hashCode(); } - public Spec(String hostName, int configServerPort, int httpPort, int zooKeeperPort) { + public Spec(String hostName, int configServerPort, int zooKeeperPort) { this.hostName = hostName; this.configServerPort = configServerPort; - this.httpPort = httpPort; this.zooKeeperPort = zooKeeperPort; } } diff --git a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV2BuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV2BuilderTest.java index f4fb3ac5247..964f8ed4818 100755 --- a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV2BuilderTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV2BuilderTest.java @@ -116,9 +116,9 @@ public class DomAdminV2BuilderTest extends DomBuilderTest { @Test public void multitenant() { List<ConfigServerSpec> configServerSpecs = Arrays.asList( - new TestProperties.Spec("test1", 19070, 19071, 2181), - new TestProperties.Spec("test2", 19070, 19071, 2181), - new TestProperties.Spec("test3", 19070, 19071, 2181)); + new TestProperties.Spec("test1", 19070, 2181), + new TestProperties.Spec("test2", 19070, 2181), + new TestProperties.Spec("test3", 19070, 2181)); Admin admin = buildAdmin(servicesMultitenantAdminOnly(), true, configServerSpecs); assertThat(admin.getConfigservers().size(), is(3)); assertThat(admin.getSlobroks().size(), is(1)); diff --git a/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTestCase.java b/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTestCase.java index 14659494780..5f6cec00b0c 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTestCase.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTestCase.java @@ -27,7 +27,6 @@ import com.yahoo.vespa.config.UnknownConfigIdException; import com.yahoo.vespa.model.ConfigProducer; import com.yahoo.vespa.model.VespaModel; import com.yahoo.vespa.model.admin.Admin; -import com.yahoo.vespa.model.admin.Configserver; import com.yahoo.vespa.model.application.validation.Validation; import com.yahoo.vespa.model.test.utils.CommonVespaModelSetup; import com.yahoo.vespa.model.test.utils.VespaModelCreatorWithFilePkg; @@ -280,7 +279,7 @@ public class VespaModelTestCase { .applicationPackage(applicationPackage) .modelHostProvisioner(new InMemoryProvisioner(true, "host1.yahoo.com")) .properties(new TestProperties() - .setConfigServerSpecs(Arrays.asList(new TestProperties.Spec("cfghost", 1234, 1235, 1236))) + .setConfigServerSpecs(Arrays.asList(new TestProperties.Spec("cfghost", 1234, 1236))) .setMultitenant(true)) .build(); VespaModel model = new VespaModel(new NullConfigModelRegistry(), deployState); diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/ConfigServerSpec.java b/configserver/src/main/java/com/yahoo/vespa/config/server/ConfigServerSpec.java index b1bcec73aa0..07c6575c78c 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/ConfigServerSpec.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/ConfigServerSpec.java @@ -13,7 +13,6 @@ public class ConfigServerSpec implements com.yahoo.config.model.api.ConfigServer private final String hostName; private final int configServerPort; - private final int httpPort; private final int zooKeeperPort; public String getHostName() { @@ -24,10 +23,6 @@ public class ConfigServerSpec implements com.yahoo.config.model.api.ConfigServer return configServerPort; } - public int getHttpPort() { - return httpPort; - } - public int getZooKeeperPort() { return zooKeeperPort; } @@ -39,7 +34,6 @@ public class ConfigServerSpec implements com.yahoo.config.model.api.ConfigServer return hostName.equals(other.hostName) && configServerPort == other.configServerPort && - httpPort == other.httpPort && zooKeeperPort == other.zooKeeperPort; } else { return false; @@ -51,25 +45,23 @@ public class ConfigServerSpec implements com.yahoo.config.model.api.ConfigServer return hostName.hashCode(); } - public ConfigServerSpec(String hostName, int configServerPort, int httpPort, int zooKeeperPort) { + public ConfigServerSpec(String hostName, int configServerPort, int zooKeeperPort) { this.hostName = hostName; this.configServerPort = configServerPort; - this.httpPort = httpPort; this.zooKeeperPort = zooKeeperPort; } public static List<com.yahoo.config.model.api.ConfigServerSpec> fromConfig(ConfigserverConfig configserverConfig) { List<com.yahoo.config.model.api.ConfigServerSpec> specs = new ArrayList<>(); for (ConfigserverConfig.Zookeeperserver server : configserverConfig.zookeeperserver()) { - // TODO We cannot be sure that http port always is rpcport + 1 - specs.add(new ConfigServerSpec(server.hostname(), configserverConfig.rpcport(), configserverConfig.rpcport() + 1, server.port())); + specs.add(new ConfigServerSpec(server.hostname(), configserverConfig.rpcport(), server.port())); } return specs; } @Override public String toString() { - return "hostname=" + hostName + ", rpc port=" + configServerPort + ", http port=" + httpPort + ", zookeeper port=" + zooKeeperPort; + return "hostname=" + hostName + ", rpc port=" + configServerPort + ", zookeeper port=" + zooKeeperPort; } } |