You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2014/07/07 21:01:47 UTC

svn commit: r1608555 - in /lucene/dev/trunk/solr: CHANGES.txt test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java

Author: shalin
Date: Mon Jul  7 19:01:46 2014
New Revision: 1608555

URL: http://svn.apache.org/r1608555
Log:
SOLR-5596: Set system property zookeeper.forceSync=no for Solr test cases

Modified:
    lucene/dev/trunk/solr/CHANGES.txt
    lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java

Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1608555&r1=1608554&r2=1608555&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Mon Jul  7 19:01:46 2014
@@ -184,6 +184,8 @@ Other Changes
 
 * SOLR-6171: Remove unused SolrCores coreNameToOrig map (Alan Woodward)
 
+* SOLR-5596: Set system property zookeeper.forceSync=no for Solr test cases. (shalin)
+
 ==================  4.9.0 ==================
 
 Versions of Major Components

Modified: lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java?rev=1608555&r1=1608554&r2=1608555&view=diff
==============================================================================
--- lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java (original)
+++ lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java Mon Jul  7 19:01:46 2014
@@ -155,7 +155,8 @@ public abstract class SolrTestCaseJ4 ext
     initCoreDataDir = createTempDir("init-core-data");
 
     System.err.println("Creating dataDir: " + initCoreDataDir.getAbsolutePath());
-    
+
+    System.setProperty("zookeeper.forceSync", "no");
     System.setProperty("jetty.testMode", "true");
     System.setProperty("enable.update.log", usually() ? "true" : "false");
     System.setProperty("tests.shardhandler.randomSeed", Long.toString(random().nextLong()));
@@ -187,6 +188,7 @@ public abstract class SolrTestCaseJ4 ext
       coreName = ConfigSolrXmlOld.DEFAULT_DEFAULT_CORE_NAME;
     } finally {
       initCoreDataDir = null;
+      System.clearProperty("zookeeper.forceSync");
       System.clearProperty("jetty.testMode");
       System.clearProperty("tests.shardhandler.randomSeed");
       System.clearProperty("enable.update.log");