You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2020/10/15 01:03:41 UTC
[lucene-solr] branch reference_impl_dev updated (15249c0 -> 3cec7a5)
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a change to branch reference_impl_dev
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git.
from 15249c0 @996 Set idle on requests so it takes affect when sharing internal http client across solr clients. Raise response size buffer (should prob look at changing that to stream like asyncRequest)
new 0491b29 @997 Jetty config tweaks.
new 3cec7a5 @998 Don't close streams for XML parsing for connection reuse.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/solr/client/solrj/embedded/JettySolrRunner.java | 5 +++--
solr/core/src/java/org/apache/solr/handler/loader/XMLLoader.java | 8 +++++---
.../src/java/org/apache/solr/response/GraphMLResponseWriter.java | 1 +
solr/server/etc/jetty-http.xml | 6 ++++--
solr/server/etc/jetty-https.xml | 5 +++--
solr/server/etc/jetty.xml | 6 +++---
6 files changed, 19 insertions(+), 12 deletions(-)
[lucene-solr] 02/02: @998 Don't close streams for XML parsing for
connection reuse.
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a commit to branch reference_impl_dev
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 3cec7a54bc7cda531ef1e7211bf73b16198b2e58
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Wed Oct 14 20:00:23 2020 -0500
@998 Don't close streams for XML parsing for connection reuse.
---
solr/core/src/java/org/apache/solr/handler/loader/XMLLoader.java | 8 +++++---
.../src/java/org/apache/solr/response/GraphMLResponseWriter.java | 1 +
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/solr/core/src/java/org/apache/solr/handler/loader/XMLLoader.java b/solr/core/src/java/org/apache/solr/handler/loader/XMLLoader.java
index cf64b8b..fae5a2e 100644
--- a/solr/core/src/java/org/apache/solr/handler/loader/XMLLoader.java
+++ b/solr/core/src/java/org/apache/solr/handler/loader/XMLLoader.java
@@ -136,7 +136,8 @@ public class XMLLoader extends ContentStreamLoader {
} catch(TransformerException te) {
throw new SolrException(SolrException.ErrorCode.BAD_REQUEST, te.getMessage(), te);
} finally {
- IOUtils.closeQuietly(is);
+ // dont close streams
+ // IOUtils.closeQuietly(is);
}
// second step: feed the intermediate DOM tree into StAX parser:
try {
@@ -146,7 +147,7 @@ public class XMLLoader extends ContentStreamLoader {
} catch (XMLStreamException e) {
throw new SolrException(SolrException.ErrorCode.BAD_REQUEST, e.getMessage(), e);
} finally {
- if (parser != null) parser.closeCompletely();
+ if (parser != null) parser.close();
}
}
// Normal XML Loader
@@ -173,7 +174,8 @@ public class XMLLoader extends ContentStreamLoader {
throw new SolrException(SolrException.ErrorCode.BAD_REQUEST, e.getMessage(), e);
} finally {
if (parser != null) parser.close();
- IOUtils.closeQuietly(is);
+ // don't close streams
+ // IOUtils.closeQuietly(is);
}
}
}
diff --git a/solr/core/src/java/org/apache/solr/response/GraphMLResponseWriter.java b/solr/core/src/java/org/apache/solr/response/GraphMLResponseWriter.java
index d6048ab..ceeab45 100644
--- a/solr/core/src/java/org/apache/solr/response/GraphMLResponseWriter.java
+++ b/solr/core/src/java/org/apache/solr/response/GraphMLResponseWriter.java
@@ -132,6 +132,7 @@ public class GraphMLResponseWriter implements QueryResponseWriter {
printWriter.write("</graph></graphml>");
} finally {
+ // don't close stream
// stream.close();
}
}
[lucene-solr] 01/02: @997 Jetty config tweaks.
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a commit to branch reference_impl_dev
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 0491b2982251b926732a9c43859c09c0d87bc4b8
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Wed Oct 14 16:19:55 2020 -0500
@997 Jetty config tweaks.
---
.../java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java | 5 +++--
solr/server/etc/jetty-http.xml | 6 ++++--
solr/server/etc/jetty-https.xml | 5 +++--
solr/server/etc/jetty.xml | 6 +++---
4 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java b/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java
index 36f3a58..ca487ad 100644
--- a/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java
+++ b/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java
@@ -336,6 +336,7 @@ public class JettySolrRunner implements Closeable {
if (sslcontext != null) {
configuration.setSecureScheme("https");
configuration.addCustomizer(new SecureRequestCustomizer());
+ configuration.setIdleTimeout(TimeUnit.MINUTES.toMillis(10));
HttpConnectionFactory http1ConnectionFactory = new HttpConnectionFactory(configuration);
if (config.onlyHttp1 || !Constants.JRE_IS_MINIMUM_JAVA9) {
@@ -350,8 +351,8 @@ public class JettySolrRunner implements Closeable {
HTTP2ServerConnectionFactory http2ConnectionFactory = new HTTP2ServerConnectionFactory(configuration);
- http2ConnectionFactory.setMaxConcurrentStreams(512);
- http2ConnectionFactory.setInputBufferSize(16384);
+ http2ConnectionFactory.setMaxConcurrentStreams(1024);
+ http2ConnectionFactory.setInputBufferSize(8192);
http2ConnectionFactory.setStreamIdleTimeout(TimeUnit.MINUTES.toMillis(10));
ALPNServerConnectionFactory alpn = new ALPNServerConnectionFactory(http2ConnectionFactory.getProtocol(), http1ConnectionFactory.getProtocol());
diff --git a/solr/server/etc/jetty-http.xml b/solr/server/etc/jetty-http.xml
index 4bdcf50..1ab464e 100644
--- a/solr/server/etc/jetty-http.xml
+++ b/solr/server/etc/jetty-http.xml
@@ -34,8 +34,10 @@
<Item>
<New class="org.eclipse.jetty.http2.server.HTTP2CServerConnectionFactory">
<Arg name="config"><Ref refid="httpConfig" /></Arg>
- <Set name="maxConcurrentStreams">512</Set>
+ <Set name="maxConcurrentStreams">1024</Set>
<Set name="inputBufferSize">8192</Set>
+ <Set name="streamIdleTimeout"><Property name="solr.jetty.http.streamIdleTimeout" default="600000"/></Set>
+
<Set name="rateControlFactory">
<New class="org.eclipse.jetty.http2.parser.WindowRateControl$Factory">
<Arg type="int"><Property name="jetty.http2.rateControl.maxEventsPerSecond" default="1000"/></Arg>
@@ -47,7 +49,7 @@
</Arg>
<Set name="host"><Property name="solr.jetty.host" default="127.0.0.1"/></Set>
<Set name="port"><Property name="jetty.port" default="8983" /></Set>
- <Set name="idleTimeout"><Property name="solr.jetty.http.idleTimeout" default="120000"/></Set>
+ <Set name="idleTimeout"><Property name="solr.jetty.http.idleTimeout" default="600000"/></Set>
<Set name="acceptorPriorityDelta"><Property name="solr.jetty.http.acceptorPriorityDelta" default="0"/></Set>
<Set name="acceptQueueSize"><Property name="solr.jetty.http.acceptQueueSize" default="4096"/></Set>
<Call name="addLifeCycleListener">
diff --git a/solr/server/etc/jetty-https.xml b/solr/server/etc/jetty-https.xml
index f66ae1a..803bb23 100644
--- a/solr/server/etc/jetty-https.xml
+++ b/solr/server/etc/jetty-https.xml
@@ -54,8 +54,9 @@
<Item>
<New class="org.eclipse.jetty.http2.server.HTTP2ServerConnectionFactory">
<Arg name="config"><Ref refid="sslHttpConfig"/></Arg>
- <Set name="maxConcurrentStreams">512</Set>
+ <Set name="maxConcurrentStreams">1024</Set>
<Set name="inputBufferSize">8192</Set>
+ <Set name="streamIdleTimeout"><Property name="solr.jetty.http.streamIdleTimeout" default="600000"/></Set>
<Set name="rateControlFactory">
<New class="org.eclipse.jetty.http2.parser.WindowRateControl$Factory">
<Arg type="int"><Property name="jetty.http2.rateControl.maxEventsPerSecond" default="1000"/></Arg>
@@ -72,7 +73,7 @@
</Arg>
<Set name="host"><Property name="solr.jetty.host" default="127.0.0.1"/></Set>
<Set name="port"><Property name="solr.jetty.https.port" default="8983" /></Set>
- <Set name="idleTimeout"><Property name="solr.jetty.https.timeout" default="120000"/></Set>
+ <Set name="idleTimeout"><Property name="solr.jetty.https.timeout" default="600000"/></Set>
<Set name="acceptorPriorityDelta"><Property name="solr.jetty.ssl.acceptorPriorityDelta" default="0"/></Set>
<Set name="acceptQueueSize"><Property name="solr.jetty.https.acceptQueueSize" default="4096"/></Set>
<Call name="addLifeCycleListener">
diff --git a/solr/server/etc/jetty.xml b/solr/server/etc/jetty.xml
index c3b7f62..c04aba9 100644
--- a/solr/server/etc/jetty.xml
+++ b/solr/server/etc/jetty.xml
@@ -59,10 +59,10 @@
<New id="httpConfig" class="org.eclipse.jetty.server.HttpConfiguration">
<Set name="secureScheme">https</Set>
<Set name="securePort"><Property name="solr.jetty.secure.port" default="8443" /></Set>
- <Set name="outputBufferSize"><Property name="solr.jetty.output.buffer.size" default="32768" /></Set>
+ <Set name="outputBufferSize"><Property name="solr.jetty.output.buffer.size" default="8192" /></Set>
<Set name="outputAggregationSize"><Property name="solr.jetty.output.aggregation.size" default="8192" /></Set>
- <Set name="requestHeaderSize"><Property name="solr.jetty.request.header.size" default="12000" /></Set>
- <Set name="responseHeaderSize"><Property name="solr.jetty.response.header.size" default="12000" /></Set>
+ <Set name="requestHeaderSize"><Property name="solr.jetty.request.header.size" default="16384" /></Set>
+ <Set name="responseHeaderSize"><Property name="solr.jetty.response.header.size" default="16384" /></Set>
<Set name="sendServerVersion"><Property name="solr.jetty.send.server.version" default="false" /></Set>
<Set name="sendDateHeader"><Property name="solr.jetty.send.date.header" default="false" /></Set>
<Set name="headerCacheSize"><Property name="solr.jetty.header.cache.size" default="512" /></Set>