You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by kr...@apache.org on 2019/12/19 00:30:53 UTC
[lucene-solr] branch branch_8x updated: SOLR-14091: Removing
deprecated configuration of Jetty's soLingerTime option
This is an automated email from the ASF dual-hosted git repository.
krisden pushed a commit to branch branch_8x
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/branch_8x by this push:
new d226aba SOLR-14091: Removing deprecated configuration of Jetty's soLingerTime option
d226aba is described below
commit d226aba686dc271562779ed88b2a232243f83809
Author: Matthias Krueger <co...@mkr.io>
AuthorDate: Mon Dec 16 10:12:16 2019 +0100
SOLR-14091: Removing deprecated configuration of Jetty's soLingerTime option
Signed-off-by: Kevin Risden <kr...@apache.org>
---
solr/CHANGES.txt | 3 +++
.../solr/client/solrj/embedded/JettySolrRunner.java | 2 --
solr/server/etc/jetty-http.xml | 3 +--
solr/server/etc/jetty-https.xml | 7 +++----
solr/server/etc/jetty-https8.xml | 3 +--
.../org/apache/solr/client/solrj/StartSolrJetty.java | 11 +++++------
.../solr/client/solrj/embedded/JettyWebappTest.java | 17 ++++++++---------
7 files changed, 21 insertions(+), 25 deletions(-)
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 06bad89..3379605 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -62,6 +62,9 @@ Other Changes
* SOLR-14047: Make sure tests don't pickup other Hadoop installs (Kevin Risden)
* SOLR-14054: Upgrade to Tika 1.23 when available (Tim Allison)
+
+* SOLR-14091: Remove deprecated soLingerTime when configuring Jetty connector (Matthias Krueger via Kevin Risden)
+
================== 8.4.0 ==================
Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.
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 7ee1c08..247702d 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
@@ -319,7 +319,6 @@ public class JettySolrRunner {
}
connector.setReuseAddress(true);
- connector.setSoLingerTime(-1);
connector.setPort(port);
connector.setHost("127.0.0.1");
connector.setIdleTimeout(THREAD_POOL_MAX_IDLE_TIME_MS);
@@ -330,7 +329,6 @@ public class JettySolrRunner {
HttpConfiguration configuration = new HttpConfiguration();
ServerConnector connector = new ServerConnector(server, new HttpConnectionFactory(configuration));
connector.setPort(port);
- connector.setSoLingerTime(-1);
connector.setIdleTimeout(THREAD_POOL_MAX_IDLE_TIME_MS);
server.setConnectors(new Connector[] {connector});
}
diff --git a/solr/server/etc/jetty-http.xml b/solr/server/etc/jetty-http.xml
index 018cfe6..42e99be 100644
--- a/solr/server/etc/jetty-http.xml
+++ b/solr/server/etc/jetty-http.xml
@@ -41,11 +41,10 @@
<Set name="host"><Property name="jetty.host" /></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="soLingerTime"><Property name="solr.jetty.http.soLingerTime" default="-1"/></Set>
<Set name="acceptorPriorityDelta"><Property name="solr.jetty.http.acceptorPriorityDelta" default="0"/></Set>
<Set name="acceptQueueSize"><Property name="solr.jetty.http.acceptQueueSize" default="0"/></Set>
</New>
</Arg>
</Call>
-</Configure>
\ No newline at end of file
+</Configure>
diff --git a/solr/server/etc/jetty-https.xml b/solr/server/etc/jetty-https.xml
index 41c3f19..03a384e 100644
--- a/solr/server/etc/jetty-https.xml
+++ b/solr/server/etc/jetty-https.xml
@@ -12,7 +12,7 @@
<Set name="CipherComparator">
<Get class="org.eclipse.jetty.http2.HTTP2Cipher" name="COMPARATOR"/>
</Set>
- <Set name="useCipherSuitesOrder">true</Set>
+ <Set name="useCipherSuitesOrder">true</Set>
</Ref>
<!-- =========================================================== -->
@@ -41,14 +41,14 @@
</New>
</Item>
<Item>
- <New id="alpn" class="org.eclipse.jetty.alpn.server.ALPNServerConnectionFactory">
+ <New id="alpn" class="org.eclipse.jetty.alpn.server.ALPNServerConnectionFactory">
<Arg name="protocols">
<Array type="java.lang.String">
<Item>h2</Item>
<Item>http/1.1</Item>
</Array>
</Arg>
- <Set name="defaultProtocol">http/1.1</Set>
+ <Set name="defaultProtocol">http/1.1</Set>
</New>
</Item>
<Item>
@@ -66,7 +66,6 @@
<Set name="host"><Property name="solr.jetty.host" /></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="soLingerTime"><Property name="solr.jetty.https.soLingerTime" default="-1"/></Set>
<Set name="acceptorPriorityDelta"><Property name="solr.jetty.ssl.acceptorPriorityDelta" default="0"/></Set>
<Set name="acceptQueueSize"><Property name="solr.jetty.https.acceptQueueSize" default="0"/></Set>
</New>
diff --git a/solr/server/etc/jetty-https8.xml b/solr/server/etc/jetty-https8.xml
index 82e3a97..9c090ab 100644
--- a/solr/server/etc/jetty-https8.xml
+++ b/solr/server/etc/jetty-https8.xml
@@ -60,10 +60,9 @@
<Set name="host"><Property name="solr.jetty.host" /></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="soLingerTime"><Property name="solr.jetty.https.soLingerTime" default="-1"/></Set>
<Set name="acceptorPriorityDelta"><Property name="solr.jetty.ssl.acceptorPriorityDelta" default="0"/></Set>
<Set name="acceptQueueSize"><Property name="solr.jetty.https.acceptQueueSize" default="0"/></Set>
</New>
</Arg>
</Call>
-</Configure>
\ No newline at end of file
+</Configure>
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/StartSolrJetty.java b/solr/solrj/src/test/org/apache/solr/client/solrj/StartSolrJetty.java
index c231cc3..f915300 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/StartSolrJetty.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/StartSolrJetty.java
@@ -25,9 +25,9 @@ import org.eclipse.jetty.webapp.WebAppContext;
/**
* @since solr 1.3
*/
-public class StartSolrJetty
+public class StartSolrJetty
{
- public static void main( String[] args )
+ public static void main( String[] args )
{
//System.setProperty("solr.solr.home", "../../../example/solr");
@@ -35,10 +35,9 @@ public class StartSolrJetty
ServerConnector connector = new ServerConnector(server, new HttpConnectionFactory());
// Set some timeout options to make debugging easier.
connector.setIdleTimeout(1000 * 60 * 60);
- connector.setSoLingerTime(-1);
connector.setPort(8983);
server.setConnectors(new Connector[] { connector });
-
+
WebAppContext bb = new WebAppContext();
bb.setServer(server);
bb.setContextPath("/solr");
@@ -51,7 +50,7 @@ public class StartSolrJetty
// server.getContainer().addEventListener(mBeanContainer);
// mBeanContainer.start();
// }
-
+
server.setHandler(bb);
try {
@@ -62,7 +61,7 @@ public class StartSolrJetty
}
server.stop();
server.join();
- }
+ }
catch (Exception e) {
e.printStackTrace();
System.exit(100);
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java
index 4d76f02..3a1fc89 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java
@@ -47,13 +47,13 @@ import org.junit.rules.TestRule;
*
* @since solr 1.3
*/
-public class JettyWebappTest extends SolrTestCaseJ4
+public class JettyWebappTest extends SolrTestCaseJ4
{
int port = 0;
static final String context = "/test";
-
+
@Rule
- public TestRule solrTestRules =
+ public TestRule solrTestRules =
RuleChain.outerRule(new SystemPropertiesRestoreRule());
Server server;
@@ -65,7 +65,7 @@ public class JettyWebappTest extends SolrTestCaseJ4
System.setProperty("solr.solr.home", SolrJettyTestBase.legacyExampleCollection1SolrHome());
System.setProperty("tests.shardhandler.randomSeed", Long.toString(random().nextLong()));
System.setProperty("solr.tests.doContainerStreamCloseAssert", "false");
-
+
File dataDir = createTempDir().toFile();
dataDir.mkdirs();
@@ -79,11 +79,10 @@ public class JettyWebappTest extends SolrTestCaseJ4
ServerConnector connector = new ServerConnector(server, new HttpConnectionFactory());
connector.setIdleTimeout(1000 * 60 * 60);
- connector.setSoLingerTime(-1);
connector.setPort(0);
server.setConnectors(new Connector[]{connector});
server.setStopAtShutdown( true );
-
+
server.start();
port = connector.getLocalPort();
}
@@ -99,12 +98,12 @@ public class JettyWebappTest extends SolrTestCaseJ4
System.clearProperty("solr.tests.doContainerStreamCloseAssert");
super.tearDown();
}
-
+
public void testAdminUI() throws Exception
{
- // Currently not an extensive test, but it does fire up the JSP pages and make
+ // Currently not an extensive test, but it does fire up the JSP pages and make
// sure they compile ok
-
+
String adminPath = "http://127.0.0.1:"+port+context+"/";
byte[] bytes = IOUtils.toByteArray( new URL(adminPath).openStream() );
assertNotNull( bytes ); // real error will be an exception