From d226aba686dc271562779ed88b2a232243f83809 Mon Sep 17 00:00:00 2001 From: Matthias Krueger Date: Mon, 16 Dec 2019 10:12:16 +0100 Subject: [PATCH] SOLR-14091: Removing deprecated configuration of Jetty's soLingerTime option Signed-off-by: Kevin Risden --- solr/CHANGES.txt | 3 +++ .../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 +-- .../solr/client/solrj/StartSolrJetty.java | 11 +++++------ .../client/solrj/embedded/JettyWebappTest.java | 17 ++++++++--------- 7 files changed, 21 insertions(+), 25 deletions(-) diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index 06bad8903d0..3379605eb54 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 7ee1c0823e7..247702dab7c 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 018cfe6c0ed..42e99be82d3 100644 --- a/solr/server/etc/jetty-http.xml +++ b/solr/server/etc/jetty-http.xml @@ -41,11 +41,10 @@ - - \ No newline at end of file + diff --git a/solr/server/etc/jetty-https.xml b/solr/server/etc/jetty-https.xml index 41c3f197d71..03a384ec3ea 100644 --- a/solr/server/etc/jetty-https.xml +++ b/solr/server/etc/jetty-https.xml @@ -12,7 +12,7 @@ - true + true @@ -41,14 +41,14 @@ - + h2 http/1.1 - http/1.1 + http/1.1 @@ -66,7 +66,6 @@ - diff --git a/solr/server/etc/jetty-https8.xml b/solr/server/etc/jetty-https8.xml index 82e3a971365..9c090ab3ef3 100644 --- a/solr/server/etc/jetty-https8.xml +++ b/solr/server/etc/jetty-https8.xml @@ -60,10 +60,9 @@ - - \ No newline at end of file + 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 c231cc3173e..f915300f4c8 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 4d76f02d8db..3a1fc893fbc 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