diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-10-02 15:16:53 +0200 |
|---|---|---|
| committer | Henning Baldersheim <balder@yahoo-inc.com> | 2017-10-02 15:16:53 +0200 |
| commit | b4a1fb3099efa26d66d2b15c35271944a9314430 (patch) | |
| tree | d562be87ad0e9491509c3c9f154eefd34902703a | |
| parent | 77ceabe42589df88ea5dc12617d04f49e41d93d1 (diff) | |
Stay conservative and not reduce and remove ports.
| -rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/search/SearchNode.java | 6 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/vespa/model/search/MultilevelDispatchTest.java | 24 |
2 files changed, 15 insertions, 15 deletions
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 a54161daaac..6fce100fdbc 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 @@ -103,7 +103,7 @@ public class SearchNode extends AbstractService implements this.flushOnShutdown = flushOnShutdown; portsMeta.on(0).tag("rpc").tag("rtc").tag("admin").tag("status"); portsMeta.on(1).tag("fs4"); - portsMeta.on(2).tag("http").tag("json").tag("health").tag("state"); + portsMeta.on(4).tag("http").tag("json").tag("health").tag("state"); // Properties are set in DomSearchBuilder monitorService(); this.tuning = tuning; @@ -143,7 +143,7 @@ public class SearchNode extends AbstractService implements */ @Override public int getPortCount() { - return 3; + return 5; } /** @@ -184,7 +184,7 @@ public class SearchNode extends AbstractService implements } public int getHttpPort() { - return getRelativePort(2); + return getRelativePort(4); } @Override diff --git a/config-model/src/test/java/com/yahoo/vespa/model/search/MultilevelDispatchTest.java b/config-model/src/test/java/com/yahoo/vespa/model/search/MultilevelDispatchTest.java index 262ee409b5f..ff611d4ad0c 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/search/MultilevelDispatchTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/search/MultilevelDispatchTest.java @@ -143,12 +143,12 @@ public class MultilevelDispatchTest { assertEquals("tlds/tld.0", tld.getConfigId()); assertEquals(0, getFdispatchrcConfig(tld).dispatchlevel()); new EngineAsserter(2, 6, tld). - assertEngine(0, 0, "tcp/mh0:19111"). - assertEngine(1, 0, "tcp/mh1:19111"). - assertEngine(2, 0, "tcp/mh2:19111"). - assertEngine(0, 1, "tcp/mh3:19111"). - assertEngine(1, 1, "tcp/mh4:19111"). - assertEngine(2, 1, "tcp/mh5:19111"); + assertEngine(0, 0, "tcp/mh0:19113"). + assertEngine(1, 0, "tcp/mh1:19113"). + assertEngine(2, 0, "tcp/mh2:19113"). + assertEngine(0, 1, "tcp/mh3:19113"). + assertEngine(1, 1, "tcp/mh4:19113"). + assertEngine(2, 1, "tcp/mh5:19113"); List<Dispatch> ds = getDispatchers(tld); assertEquals(6, ds.size()); @@ -253,12 +253,12 @@ public class MultilevelDispatchTest { assertEquals("tlds/tld.0", tld.getConfigId()); assertEquals(0, getFdispatchrcConfig(tld).dispatchlevel()); new EngineAsserter(2, 6, tld). - assertEngine(0, 0, "tcp/mh0:19111"). - assertEngine(1, 0, "tcp/mh2:19111"). - assertEngine(2, 0, "tcp/mh4:19111"). - assertEngine(0, 1, "tcp/mh1:19111"). - assertEngine(1, 1, "tcp/mh3:19111"). - assertEngine(2, 1, "tcp/mh5:19111"); + assertEngine(0, 0, "tcp/mh0:19113"). + assertEngine(1, 0, "tcp/mh2:19113"). + assertEngine(2, 0, "tcp/mh4:19113"). + assertEngine(0, 1, "tcp/mh1:19113"). + assertEngine(1, 1, "tcp/mh3:19113"). + assertEngine(2, 1, "tcp/mh5:19113"); List<Dispatch> ds = getDispatchers(tld); assertEquals(6, ds.size()); |