From bba56f893d357e2673894ec70ebcf202b96d1c15 Mon Sep 17 00:00:00 2001
From: Robert Muir <rmuir@apache.org>
Date: Wed, 13 Oct 2010 01:01:52 +0000
Subject: [PATCH] SOLR-2002: try setting SO_REUSEADDR during jetty tests to
 prevent failures for disconnect/reconnect tests

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1021969 13f79535-47bb-0310-9956-ffa450edef68
---
 lucene/common-build.xml                                  | 2 +-
 solr/build.xml                                           | 2 +-
 solr/contrib/clustering/build.xml                        | 2 +-
 solr/contrib/dataimporthandler/build.xml                 | 4 ++--
 solr/contrib/extraction/build.xml                        | 2 +-
 .../solr/client/solrj/embedded/JettySolrRunner.java      | 9 +++++++--
 6 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/lucene/common-build.xml b/lucene/common-build.xml
index c0792c09f7f..2b93e19c5c2 100644
--- a/lucene/common-build.xml
+++ b/lucene/common-build.xml
@@ -470,7 +470,7 @@
 	      <sysproperty key="lucene.version" value="${dev.version}"/>
               
               <sysproperty key="testmethod" value="${testmethod}"/>
-              <sysproperty key="jetty.insecurerandom" value="1"/>
+              <sysproperty key="jetty.testMode" value="1"/>
 	    	
 	      <formatter type="xml"/>
 	      <formatter classname="${junit.details.formatter}" usefile="false"/>
diff --git a/solr/build.xml b/solr/build.xml
index bcb4cd11195..b1798cb80f7 100644
--- a/solr/build.xml
+++ b/solr/build.xml
@@ -435,7 +435,7 @@
       <sysproperty key="tests.multiplier" value="${tests.multiplier}"/>
       <sysproperty key="tests.iter" value="${tests.iter}"/>
       <sysproperty key="tests.seed" value="${tests.seed}"/>
-      <sysproperty key="jetty.insecurerandom" value="1"/>
+      <sysproperty key="jetty.testMode" value="1"/>
       <sysproperty key="tempDir" file="@{tempDir}/@{threadNum}"/>
       <sysproperty key="testmethod" value="${testmethod}"/>
       <!-- TODO: why is this unconditionally set to "" above? disable for now
diff --git a/solr/contrib/clustering/build.xml b/solr/contrib/clustering/build.xml
index a6dc5787e95..db024434f5f 100644
--- a/solr/contrib/clustering/build.xml
+++ b/solr/contrib/clustering/build.xml
@@ -116,7 +116,7 @@
       <sysproperty key="tests.multiplier" value="${tests.multiplier}"/>
       <sysproperty key="tests.seed" value="${tests.seed}"/>
       <sysproperty key="tests.iter" value="${tests.iter}"/>
-      <sysproperty key="jetty.insecurerandom" value="1"/>
+      <sysproperty key="jetty.testMode" value="1"/>
       <sysproperty key="tempDir" file="${junit.output.dir}"/>
       <sysproperty key="testmethod" value="${testmethod}"/>
       <jvmarg line="${args}"/>
diff --git a/solr/contrib/dataimporthandler/build.xml b/solr/contrib/dataimporthandler/build.xml
index aa1778740e5..164536af4da 100644
--- a/solr/contrib/dataimporthandler/build.xml
+++ b/solr/contrib/dataimporthandler/build.xml
@@ -168,7 +168,7 @@
       <sysproperty key="tests.multiplier" value="${tests.multiplier}"/>
       <sysproperty key="tests.iter" value="${tests.iter}"/>
       <sysproperty key="tests.seed" value="${tests.seed}"/>
-      <sysproperty key="jetty.insecurerandom" value="1"/>
+      <sysproperty key="jetty.testMode" value="1"/>
       <sysproperty key="tempDir" file="${tempDir}"/>
       <sysproperty key="testmethod" value="${testmethod}"/>
       <jvmarg line="${args}"/>
@@ -226,7 +226,7 @@
       <sysproperty key="tests.multiplier" value="${tests.multiplier}"/>
       <sysproperty key="tests.iter" value="${tests.iter}"/>
       <sysproperty key="tests.seed" value="${tests.seed}"/>
-      <sysproperty key="jetty.insecurerandom" value="1"/>
+      <sysproperty key="jetty.testMode" value="1"/>
       <sysproperty key="tempDir" file="${tempDir}"/>
       <sysproperty key="testmethod" value="${testmethod}"/>
       <jvmarg line="${args}"/>
diff --git a/solr/contrib/extraction/build.xml b/solr/contrib/extraction/build.xml
index cfa3a9c8b0d..bfc15782f10 100644
--- a/solr/contrib/extraction/build.xml
+++ b/solr/contrib/extraction/build.xml
@@ -117,7 +117,7 @@
       <sysproperty key="tests.multiplier" value="${tests.multiplier}"/>
       <sysproperty key="tests.iter" value="${tests.iter}"/>
       <sysproperty key="tests.seed" value="${tests.seed}"/>
-      <sysproperty key="jetty.insecurerandom" value="1"/>
+      <sysproperty key="jetty.testMode" value="1"/>
       <sysproperty key="tempDir" file="${tempDir}"/>
       <sysproperty key="testmethod" value="${testmethod}"/>
       <jvmarg line="${args}"/>
diff --git a/solr/src/webapp/src/org/apache/solr/client/solrj/embedded/JettySolrRunner.java b/solr/src/webapp/src/org/apache/solr/client/solrj/embedded/JettySolrRunner.java
index 146d4c151aa..5078514b846 100644
--- a/solr/src/webapp/src/org/apache/solr/client/solrj/embedded/JettySolrRunner.java
+++ b/solr/src/webapp/src/org/apache/solr/client/solrj/embedded/JettySolrRunner.java
@@ -30,6 +30,7 @@ import org.apache.solr.servlet.SolrDispatchFilter;
 import org.mortbay.jetty.Handler;
 import org.mortbay.jetty.Server;
 import org.mortbay.jetty.Connector;
+import org.mortbay.jetty.nio.SelectChannelConnector;
 import org.mortbay.jetty.servlet.Context;
 import org.mortbay.jetty.servlet.FilterHolder;
 import org.mortbay.jetty.servlet.HashSessionIdManager;
@@ -77,9 +78,13 @@ public class JettySolrRunner
   {
     this.context = context;
     server = new Server( port );    
-    if (System.getProperty("jetty.insecurerandom") != null)
+    if (System.getProperty("jetty.testMode") != null) {
+      SelectChannelConnector connector = new SelectChannelConnector();
+      connector.setPort(port);
+      connector.setReuseAddress(true);
+      server.setConnectors(new Connector[] { connector });
       server.setSessionIdManager(new HashSessionIdManager(new Random()));
-
+    }
     server.setStopAtShutdown( true );
     
     // Initialize the servlets