You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2012/12/14 23:21:35 UTC
svn commit: r1422128 - in /lucene/dev/branches/branch_4x: ./ dev-tools/
dev-tools/maven/solr/ lucene/ solr/ solr/core/
solr/core/src/java/org/apache/solr/client/solrj/embedded/
Author: uschindler
Date: Fri Dec 14 22:21:31 2012
New Revision: 1422128
URL: http://svn.apache.org/viewvc?rev=1422128&view=rev
Log:
Merged revision(s) 1422127 from lucene/dev/trunk:
SOLR-4189: Fix hanging threads on FreeBSD in JettySolrRunner by making connector configureable through sysprop, listen only on 127.0.0.1 in tests
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/build.xml
lucene/dev/branches/branch_4x/dev-tools/ (props changed)
lucene/dev/branches/branch_4x/dev-tools/maven/solr/pom.xml.template
lucene/dev/branches/branch_4x/extra-targets.xml
lucene/dev/branches/branch_4x/lucene/ (props changed)
lucene/dev/branches/branch_4x/lucene/common-build.xml (contents, props changed)
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/core/ (props changed)
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java
Modified: lucene/dev/branches/branch_4x/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/build.xml?rev=1422128&r1=1422127&r2=1422128&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/build.xml (original)
+++ lucene/dev/branches/branch_4x/build.xml Fri Dec 14 22:21:31 2012
@@ -154,6 +154,7 @@
<subant buildpath="." antfile="extra-targets.xml" target="-run-maven-build" inheritall="false" failonerror="true">
<propertyset>
<propertyref prefix="maven-"/>
+ <propertyref builtin="commandline"/>
</propertyset>
</subant>
</target>
Modified: lucene/dev/branches/branch_4x/dev-tools/maven/solr/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/maven/solr/pom.xml.template?rev=1422128&r1=1422127&r2=1422128&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/maven/solr/pom.xml.template (original)
+++ lucene/dev/branches/branch_4x/dev-tools/maven/solr/pom.xml.template Fri Dec 14 22:21:31 2012
@@ -99,6 +99,15 @@
<doctitle>${project.name} ${project.version} API (${now.version})</doctitle>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemPropertyVariables>
+ <tests.jettyConnector>${tests.jettyConnector}</tests.jettyConnector>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
</build>
Modified: lucene/dev/branches/branch_4x/extra-targets.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/extra-targets.xml?rev=1422128&r1=1422127&r2=1422128&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/extra-targets.xml (original)
+++ lucene/dev/branches/branch_4x/extra-targets.xml Fri Dec 14 22:21:31 2012
@@ -56,6 +56,9 @@
mavenVersion="${maven-version}" failonerror="true" fork="true">
<arg value="-fae"/>
<arg value="install"/>
+ <syspropertyset>
+ <propertyref builtin="commandline"/>
+ </syspropertyset>
</mvn>
</target>
Modified: lucene/dev/branches/branch_4x/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/common-build.xml?rev=1422128&r1=1422127&r2=1422128&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/common-build.xml (original)
+++ lucene/dev/branches/branch_4x/lucene/common-build.xml Fri Dec 14 22:21:31 2012
@@ -916,6 +916,7 @@
<propertyref prefix="tests.failfast" />
<propertyref prefix="tests.badapples" />
<propertyref prefix="tests.timeoutSuite" />
+ <propertyref prefix="tests.jettyConnector" />
</syspropertyset>
<!-- Pass randomized settings to the forked JVM. -->
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java?rev=1422128&r1=1422127&r2=1422128&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java Fri Dec 14 22:21:31 2012
@@ -154,12 +154,25 @@ public class JettySolrRunner {
}
System.setProperty("solr.solr.home", solrHome);
if (System.getProperty("jetty.testMode") != null) {
- SelectChannelConnector connector = new SelectChannelConnector();
+ final String connectorName = System.getProperty("tests.jettyConnector", "SelectChannel");
+ final Connector connector;
+ final QueuedThreadPool threadPool;
+ if ("SelectChannel".equals(connectorName)) {
+ final SelectChannelConnector c = new SelectChannelConnector();
+ c.setReuseAddress(true);
+ c.setLowResourcesMaxIdleTime(1500);
+ connector = c;
+ threadPool = (QueuedThreadPool) c.getThreadPool();
+ } else if ("Socket".equals(connectorName)) {
+ final SocketConnector c = new SocketConnector();
+ c.setReuseAddress(true);
+ connector = c;
+ threadPool = (QueuedThreadPool) c.getThreadPool();
+ } else {
+ throw new IllegalArgumentException("Illegal value for system property 'tests.jettyConnector': " + connectorName);
+ }
connector.setPort(port);
- connector.setReuseAddress(true);
- connector.setLowResourcesMaxIdleTime(1500);
- QueuedThreadPool threadPool = (QueuedThreadPool) connector
- .getThreadPool();
+ connector.setHost("127.0.0.1");
if (threadPool != null) {
threadPool.setMaxThreads(10000);
threadPool.setMaxIdleTimeMs(5000);