You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2013/03/18 16:50:12 UTC

svn commit: r1457828 - in /lucene/dev/branches/branch_4x: ./ solr/ solr/core/ solr/core/src/java/org/apache/solr/core/ solr/core/src/java/org/apache/solr/handler/component/ solr/core/src/test/org/apache/solr/ solr/core/src/test/org/apache/solr/schema/ ...

Author: rmuir
Date: Mon Mar 18 15:50:11 2013
New Revision: 1457828

URL: http://svn.apache.org/r1457828
Log:
SOLR-4606: set the random seed used to shuffle shards within tests

Modified:
    lucene/dev/branches/branch_4x/   (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/core/SolrProperties.java
    lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandlerFactory.java
    lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/TestSolrCoreProperties.java
    lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/schema/TestBinaryField.java
    lucene/dev/branches/branch_4x/solr/solrj/   (props changed)
    lucene/dev/branches/branch_4x/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrServer.java
    lucene/dev/branches/branch_4x/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/AbstractEmbeddedSolrServerTestCase.java
    lucene/dev/branches/branch_4x/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java
    lucene/dev/branches/branch_4x/solr/test-framework/   (props changed)
    lucene/dev/branches/branch_4x/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java

Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/core/SolrProperties.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/core/SolrProperties.java?rev=1457828&r1=1457827&r2=1457828&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/core/SolrProperties.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/core/SolrProperties.java Mon Mar 18 15:50:11 2013
@@ -270,8 +270,7 @@ public class SolrProperties implements C
     try {
       fac = loader.findClass(info.className, ShardHandlerFactory.class).newInstance();
     } catch (Exception e) {
-      throw new SolrException(SolrException.ErrorCode.SERVER_ERROR,
-                              "Error instantiating shardHandlerFactory class " + info.className);
+      throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, e);
     }
     if (fac instanceof PluginInfoInitialized) {
       ((PluginInfoInitialized) fac).init(info);

Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandlerFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandlerFactory.java?rev=1457828&r1=1457827&r2=1457828&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandlerFactory.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandlerFactory.java Mon Mar 18 15:50:11 2013
@@ -124,6 +124,12 @@ public class HttpShardHandlerFactory ext
     this.keepAliveTime = getParameter(args, MAX_THREAD_IDLE_TIME, keepAliveTime);
     this.queueSize = getParameter(args, INIT_SIZE_OF_QUEUE, queueSize);
     this.accessPolicy = getParameter(args, INIT_FAIRNESS_POLICY, accessPolicy);
+    
+    // magic sysprop to make tests reproducible: set by SolrTestCaseJ4.
+    String v = System.getProperty("tests.shardhandler.randomSeed");
+    if (v != null) {
+      r.setSeed(Long.parseLong(v));
+    }
 
     BlockingQueue<Runnable> blockingQueue = (this.queueSize == -1) ?
         new SynchronousQueue<Runnable>(this.accessPolicy) :

Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/TestSolrCoreProperties.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/TestSolrCoreProperties.java?rev=1457828&r1=1457827&r2=1457828&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/TestSolrCoreProperties.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/TestSolrCoreProperties.java Mon Mar 18 15:50:11 2013
@@ -46,6 +46,7 @@ public class TestSolrCoreProperties exte
     super.setUp();
     setUpMe();
     System.setProperty("solr.data.dir", getDataDir());
+    System.setProperty("tests.shardhandler.randomSeed", Long.toString(random().nextLong()));
     
     solrJetty = new JettySolrRunner(getHomeDir(), "/solr", 0);
 
@@ -58,6 +59,7 @@ public class TestSolrCoreProperties exte
   @Override
   public void tearDown() throws Exception {
     solrJetty.stop();
+    System.clearProperty("tests.shardhandler.randomSeed");
     AbstractSolrTestCase.recurseDelete(homeDir);
     super.tearDown();
   }

Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/schema/TestBinaryField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/schema/TestBinaryField.java?rev=1457828&r1=1457827&r2=1457828&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/schema/TestBinaryField.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/schema/TestBinaryField.java Mon Mar 18 15:50:11 2013
@@ -76,6 +76,7 @@ public class TestBinaryField extends Luc
     System.setProperty("solr.data.dir", dataDir.getAbsolutePath());
     System.setProperty("solr.test.sys.prop1", "propone");
     System.setProperty("solr.test.sys.prop2", "proptwo");
+    System.setProperty("tests.shardhandler.randomSeed", Long.toString(random().nextLong()));
 
     jetty = new JettySolrRunner(homeDir.getAbsolutePath(), context, 0);
     jetty.start();
@@ -182,6 +183,7 @@ public class TestBinaryField extends Luc
   @Override
   public void tearDown() throws Exception {
     jetty.stop();
+    System.clearProperty("tests.shardhandler.randomSeed");
     super.tearDown();
   }
 }

Modified: lucene/dev/branches/branch_4x/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrServer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrServer.java?rev=1457828&r1=1457827&r2=1457828&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrServer.java (original)
+++ lucene/dev/branches/branch_4x/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrServer.java Mon Mar 18 15:50:11 2013
@@ -72,6 +72,7 @@ public class TestLBHttpSolrServer extend
   public static void beforeClass() {
     savedFactory = System.getProperty("solr.DirectoryFactory");
     System.setProperty("solr.directoryFactory", "org.apache.solr.core.MockFSDirectoryFactory");
+    System.setProperty("tests.shardhandler.randomSeed", Long.toString(random().nextLong()));
   }
 
   @AfterClass
@@ -81,6 +82,7 @@ public class TestLBHttpSolrServer extend
     } else {
       System.setProperty("solr.directoryFactory", savedFactory);
     }
+    System.clearProperty("tests.shardhandler.randomSeed");
   }
   
   @Override

Modified: lucene/dev/branches/branch_4x/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/AbstractEmbeddedSolrServerTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/AbstractEmbeddedSolrServerTestCase.java?rev=1457828&r1=1457827&r2=1457828&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/AbstractEmbeddedSolrServerTestCase.java (original)
+++ lucene/dev/branches/branch_4x/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/AbstractEmbeddedSolrServerTestCase.java Mon Mar 18 15:50:11 2013
@@ -60,7 +60,7 @@ public abstract class AbstractEmbeddedSo
     System.setProperty("dataDir1", dataDir.getAbsolutePath());
     System.setProperty("dataDir2", dataDir2.getAbsolutePath());
     System.setProperty("tempDir", tempDir.getAbsolutePath());
-
+    System.setProperty("tests.shardhandler.randomSeed", Long.toString(random().nextLong()));
     cores = new CoreContainer(SOLR_HOME.getAbsolutePath(), getSolrXml());
   }
   
@@ -74,7 +74,8 @@ public abstract class AbstractEmbeddedSo
 
     System.clearProperty("dataDir1");
     System.clearProperty("dataDir2");
-    
+    System.clearProperty("tests.shardhandler.randomSeed");
+
     deleteAdditionalFiles();
 
     File dataDir = new File(tempDir,"data");

Modified: lucene/dev/branches/branch_4x/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java?rev=1457828&r1=1457827&r2=1457828&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java Mon Mar 18 15:50:11 2013
@@ -55,7 +55,8 @@ public class JettyWebappTest extends Luc
   {
     super.setUp();
     System.setProperty("solr.solr.home", ExternalPaths.EXAMPLE_HOME);
-    
+    System.setProperty("tests.shardhandler.randomSeed", Long.toString(random().nextLong()));
+
     File dataDir = new File(LuceneTestCase.TEMP_DIR,
         getClass().getName() + "-" + System.currentTimeMillis());
     dataDir.mkdirs();
@@ -84,6 +85,7 @@ public class JettyWebappTest extends Luc
     try {
       server.stop();
     } catch( Exception ex ) {}
+    System.clearProperty("tests.shardhandler.randomSeed");
     super.tearDown();
   }
   

Modified: lucene/dev/branches/branch_4x/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java?rev=1457828&r1=1457827&r2=1457828&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java (original)
+++ lucene/dev/branches/branch_4x/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java Mon Mar 18 15:50:11 2013
@@ -85,6 +85,7 @@ public abstract class SolrTestCaseJ4 ext
   @SuppressWarnings("unused")
   private static void beforeClass() {
     System.setProperty("jetty.testMode", "true");
+    System.setProperty("tests.shardhandler.randomSeed", Long.toString(random().nextLong()));
     setupLogging();
     startTrackingSearchers();
     startTrackingZkClients();
@@ -101,6 +102,7 @@ public abstract class SolrTestCaseJ4 ext
     resetFactory();
     coreName = CoreContainer.DEFAULT_DEFAULT_CORE_NAME;
     System.clearProperty("jetty.testMode");
+    System.clearProperty("tests.shardhandler.randomSeed");
   }
 
   private static boolean changedFactory = false;