diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2019-04-10 21:36:42 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-04-10 21:36:42 +0200 |
commit | e5e0a4c12abfb8ba0f7ac2404e3fead3f1d055a8 (patch) | |
tree | 80e605dbeee8874f6645361fc90221e876c284f8 /vespa-http-client | |
parent | df8da587990f28c5145f01ae9aab2eaefccefd2f (diff) | |
parent | adc15ad0ee687db3858ed9a0d548f0c4810ddfa8 (diff) |
Merge pull request #9008 from vespa-engine/jobergum/reduce-connections-default
Change default persisted connections down to 1
Diffstat (limited to 'vespa-http-client')
4 files changed, 4 insertions, 5 deletions
diff --git a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/config/ConnectionParams.java b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/config/ConnectionParams.java index 3296cf13875..bd187ea3371 100644 --- a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/config/ConnectionParams.java +++ b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/config/ConnectionParams.java @@ -36,7 +36,7 @@ public final class ConnectionParams { private long connectionTimeout = TimeUnit.SECONDS.toMillis(60); private final Multimap<String, String> headers = ArrayListMultimap.create(); private final Map<String, HeaderProvider> headerProviders = new HashMap<>(); - private int numPersistentConnectionsPerEndpoint = 8; + private int numPersistentConnectionsPerEndpoint = 1; private String proxyHost = null; private int proxyPort = 8080; private boolean useCompression = false; diff --git a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/runner/CommandLineArguments.java b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/runner/CommandLineArguments.java index 98cd13a226d..4eaedb53c5b 100644 --- a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/runner/CommandLineArguments.java +++ b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/runner/CommandLineArguments.java @@ -169,7 +169,7 @@ public class CommandLineArguments { @Option(name = {"--numPersistentConnectionsPerEndpoint"}, description = "How many tcp connections to establish per endoint.)") - private int numPersistentConnectionsPerEndpoint = 16; + private int numPersistentConnectionsPerEndpoint = 1; @Option(name = {"--maxChunkSizeBytes"}, description = "How much data to send to gateway in each message.") @@ -226,7 +226,6 @@ public class CommandLineArguments { connectionParamsBuilder .setHostnameVerifier(insecure ? NoopHostnameVerifier.INSTANCE : SSLConnectionSocketFactory.getDefaultHostnameVerifier()) - .setNumPersistentConnectionsPerEndpoint(16) .setUseCompression(useCompressionArg) .setMaxRetries(noRetryArg ? 0 : 100) .setMinTimeBetweenRetries(retrydelayArg, TimeUnit.SECONDS) diff --git a/vespa-http-client/src/test/java/com/yahoo/vespa/http/client/config/ConnectionParamsTest.java b/vespa-http-client/src/test/java/com/yahoo/vespa/http/client/config/ConnectionParamsTest.java index 39c1257816c..bca43902b9e 100644 --- a/vespa-http-client/src/test/java/com/yahoo/vespa/http/client/config/ConnectionParamsTest.java +++ b/vespa-http-client/src/test/java/com/yahoo/vespa/http/client/config/ConnectionParamsTest.java @@ -25,7 +25,7 @@ public class ConnectionParamsTest { ConnectionParams params = new ConnectionParams.Builder().build(); assertThat(params.getHeaders().isEmpty(), is(true)); - assertThat(params.getNumPersistentConnectionsPerEndpoint(), is(8)); + assertThat(params.getNumPersistentConnectionsPerEndpoint(), is(1)); assertThat(params.getSslContext(), nullValue()); } diff --git a/vespa-http-client/src/test/java/com/yahoo/vespa/http/client/runner/CommandLineArgumentsTest.java b/vespa-http-client/src/test/java/com/yahoo/vespa/http/client/runner/CommandLineArgumentsTest.java index 53715259a0c..407c95e5822 100644 --- a/vespa-http-client/src/test/java/com/yahoo/vespa/http/client/runner/CommandLineArgumentsTest.java +++ b/vespa-http-client/src/test/java/com/yahoo/vespa/http/client/runner/CommandLineArgumentsTest.java @@ -91,7 +91,7 @@ public class CommandLineArgumentsTest { assertThat(params.getClusters().get(0).getEndpoints().get(0).getPort(), is(4080)); assertThat(params.getClusters().get(0).getEndpoints().get(0).isUseSsl(), is(false)); assertThat(params.getConnectionParams().getUseCompression(), is(false)); - assertThat(params.getConnectionParams().getNumPersistentConnectionsPerEndpoint(), is(16)); + assertThat(params.getConnectionParams().getNumPersistentConnectionsPerEndpoint(), is(1)); assertThat(params.getFeedParams().getRoute(), is("default")); assertThat(params.getFeedParams().getDataFormat(), is(FeedParams.DataFormat.XML_UTF8)); assertThat(params.getFeedParams().getLocalQueueTimeOut(), is(180000L)); |