diff options
| author | Martin Polden <mpolden@mpolden.no> | 2018-08-24 15:38:35 +0200 |
|---|---|---|
| committer | Martin Polden <mpolden@mpolden.no> | 2018-08-24 15:38:35 +0200 |
| commit | 2bc5471909980565a81f55e385ca4cae2e3e564c (patch) | |
| tree | e30c3980a911fb744d12cfbf7165ec83e7692397 /node-repository | |
| parent | d4b183d2e1b7bfa2ea3fc6682518b42908536403 (diff) | |
Reduce number of containers threads in node repo tests
Diffstat (limited to 'node-repository')
| -rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/ContainerConfig.java | 42 |
1 files changed, 22 insertions, 20 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/ContainerConfig.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/ContainerConfig.java index 6c43ed18645..46c144a1758 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/ContainerConfig.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/ContainerConfig.java @@ -10,26 +10,28 @@ package com.yahoo.vespa.hosted.provision.testutils; public class ContainerConfig { public static String servicesXmlV2(int port) { - return - "<jdisc version='1.0'>" + - " <component id='com.yahoo.test.ManualClock'/>" + - " <component id='com.yahoo.vespa.curator.mock.MockCurator'/>" + - " <component id='com.yahoo.vespa.hosted.provision.testutils.OrchestratorMock'/>" + - " <component id='com.yahoo.vespa.hosted.provision.testutils.MockDeployer'/>" + - " <component id='com.yahoo.vespa.hosted.provision.testutils.MockProvisioner'/>" + - " <component id='com.yahoo.vespa.hosted.provision.testutils.TestHostLivenessTracker'/>" + - " <component id='com.yahoo.vespa.hosted.provision.testutils.ServiceMonitorStub'/>" + - " <component id='com.yahoo.vespa.hosted.provision.testutils.MockNodeFlavors'/>" + - " <component id='com.yahoo.vespa.hosted.provision.testutils.MockNodeRepository'/>" + - " <component id='com.yahoo.vespa.hosted.provision.maintenance.NodeRepositoryMaintenance'/>" + - " <component id='com.yahoo.config.provision.Zone'/>" + - " <handler id='com.yahoo.vespa.hosted.provision.restapi.v2.NodesApiHandler'>" + - " <binding>http://*/nodes/v2/*</binding>" + - " </handler>" + - " <http>" + - " <server id='myServer' port='" + port + "' />" + - " </http>" + - "</jdisc>"; + return "<jdisc version='1.0'>\n" + + " <config name=\"container.handler.threadpool\">\n" + + " <maxthreads>10</maxthreads>\n" + + " </config> \n" + + " <component id='com.yahoo.test.ManualClock'/>\n" + + " <component id='com.yahoo.vespa.curator.mock.MockCurator'/>\n" + + " <component id='com.yahoo.vespa.hosted.provision.testutils.OrchestratorMock'/>\n" + + " <component id='com.yahoo.vespa.hosted.provision.testutils.MockDeployer'/>\n" + + " <component id='com.yahoo.vespa.hosted.provision.testutils.MockProvisioner'/>\n" + + " <component id='com.yahoo.vespa.hosted.provision.testutils.TestHostLivenessTracker'/>\n" + + " <component id='com.yahoo.vespa.hosted.provision.testutils.ServiceMonitorStub'/>\n" + + " <component id='com.yahoo.vespa.hosted.provision.testutils.MockNodeFlavors'/>\n" + + " <component id='com.yahoo.vespa.hosted.provision.testutils.MockNodeRepository'/>\n" + + " <component id='com.yahoo.vespa.hosted.provision.maintenance.NodeRepositoryMaintenance'/>\n" + + " <component id='com.yahoo.config.provision.Zone'/>\n" + + " <handler id='com.yahoo.vespa.hosted.provision.restapi.v2.NodesApiHandler'>\n" + + " <binding>http://*/nodes/v2/*</binding>\n" + + " </handler>\n" + + " <http>\n" + + " <server id='myServer' port='" + port + "'/>\n" + + " </http>\n" + + "</jdisc>"; } } |