From ec3ff99398b12444ef6d84064dd50ffe4189396a Mon Sep 17 00:00:00 2001 From: Bjørn Christian Seime Date: Wed, 27 Mar 2019 11:27:32 +0100 Subject: Misc fixes Keep previous default port for legacy protocol. Rename parameter 'rpcPort' => 'rpcport'. Remove 'logtp' from port suffices. --- config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java | 2 +- config-model/src/main/java/com/yahoo/vespa/model/admin/Logserver.java | 2 +- .../src/test/java/com/yahoo/vespa/model/admin/AdminTestCase.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'config-model') diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java index f4d719294cc..22811ae5878 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java @@ -151,7 +151,7 @@ public class Admin extends AbstractConfigProducer implements Serializable { logserver(new LogdConfig.Logserver.Builder(). use(logServerContainerCluster.isPresent() || !isHostedVespa). host(logserver.getHostName()). - rpcPort(logserver.getRelativePort(0)). + rpcport(logserver.getRelativePort(0)). port(logserver.getRelativePort(1))); } } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/Logserver.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/Logserver.java index 3ed1d4779b7..6c173043092 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/admin/Logserver.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/Logserver.java @@ -71,7 +71,7 @@ public class Logserver extends AbstractService { @Override public String[] getPortSuffixes() { - return new String[]{ "logtp/rpc", "logtp/legacy", "unused/1", "unused/2" }; + return new String[]{ "rpc", "legacy", "unused/1", "unused/2" }; } } diff --git a/config-model/src/test/java/com/yahoo/vespa/model/admin/AdminTestCase.java b/config-model/src/test/java/com/yahoo/vespa/model/admin/AdminTestCase.java index 3cb5ad89034..6d65c2a472e 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/admin/AdminTestCase.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/admin/AdminTestCase.java @@ -95,7 +95,7 @@ public class AdminTestCase { assertEquals(lc.logserver().host(), localhost); Service logserver = vespaModel.getService("admin/logserver").get(); - assertEquals(logserver.getRelativePort(0), lc.logserver().rpcPort()); + assertEquals(logserver.getRelativePort(0), lc.logserver().rpcport()); // Verify services in the sentinel config SentinelConfig.Builder b = new SentinelConfig.Builder(); -- cgit v1.2.3