You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2014/03/19 16:07:46 UTC
svn commit: r1579253 - in /lucene/dev/branches/branch_4x: ./ solr/
solr/test-framework/
solr/test-framework/src/java/org/apache/solr/cloud/AbstractDistribZkTestBase.java
solr/test-framework/src/java/org/apache/solr/cloud/AbstractZkTestCase.java
Author: markrmiller
Date: Wed Mar 19 15:07:45 2014
New Revision: 1579253
URL: http://svn.apache.org/r1579253
Log:
SOLR-5880: Start using zookeeper.forceSync=false in tests.
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/test-framework/ (props changed)
lucene/dev/branches/branch_4x/solr/test-framework/src/java/org/apache/solr/cloud/AbstractDistribZkTestBase.java
lucene/dev/branches/branch_4x/solr/test-framework/src/java/org/apache/solr/cloud/AbstractZkTestCase.java
Modified: lucene/dev/branches/branch_4x/solr/test-framework/src/java/org/apache/solr/cloud/AbstractDistribZkTestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/test-framework/src/java/org/apache/solr/cloud/AbstractDistribZkTestBase.java?rev=1579253&r1=1579252&r2=1579253&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/test-framework/src/java/org/apache/solr/cloud/AbstractDistribZkTestBase.java (original)
+++ lucene/dev/branches/branch_4x/solr/test-framework/src/java/org/apache/solr/cloud/AbstractDistribZkTestBase.java Wed Mar 19 15:07:45 2014
@@ -68,7 +68,7 @@ public abstract class AbstractDistribZkT
System.setProperty(ZK_HOST, zkServer.getZkAddress());
System.setProperty(ENABLE_UPDATE_LOG, "true");
System.setProperty(REMOVE_VERSION_FIELD, "true");
- //System.setProperty(ZOOKEEPER_FORCE_SYNC, "false");
+ System.setProperty(ZOOKEEPER_FORCE_SYNC, "false");
String schema = getSchemaFile();
if (schema == null) schema = "schema.xml";
@@ -223,7 +223,7 @@ public abstract class AbstractDistribZkT
System.clearProperty("solr.directoryFactory");
System.clearProperty("solr.test.sys.prop1");
System.clearProperty("solr.test.sys.prop2");
- //System.clearProperty(ZOOKEEPER_FORCE_SYNC);
+ System.clearProperty(ZOOKEEPER_FORCE_SYNC);
resetExceptionIgnores();
super.tearDown();
Modified: lucene/dev/branches/branch_4x/solr/test-framework/src/java/org/apache/solr/cloud/AbstractZkTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/test-framework/src/java/org/apache/solr/cloud/AbstractZkTestCase.java?rev=1579253&r1=1579252&r2=1579253&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/test-framework/src/java/org/apache/solr/cloud/AbstractZkTestCase.java (original)
+++ lucene/dev/branches/branch_4x/solr/test-framework/src/java/org/apache/solr/cloud/AbstractZkTestCase.java Wed Mar 19 15:07:45 2014
@@ -72,7 +72,7 @@ public abstract class AbstractZkTestCase
System.setProperty("solrcloud.skip.autorecovery", "true");
System.setProperty("zkHost", zkServer.getZkAddress());
System.setProperty("jetty.port", "0000");
- //System.setProperty(ZOOKEEPER_FORCE_SYNC, "false");
+ System.setProperty(ZOOKEEPER_FORCE_SYNC, "false");
buildZooKeeper(zkServer.getZkHost(), zkServer.getZkAddress(), SOLRHOME,
"solrconfig.xml", "schema.xml");
@@ -154,7 +154,7 @@ public abstract class AbstractZkTestCase
System.clearProperty("solr.test.sys.prop2");
System.clearProperty("solrcloud.skip.autorecovery");
System.clearProperty("jetty.port");
- //System.clearProperty(ZOOKEEPER_FORCE_SYNC);
+ System.clearProperty(ZOOKEEPER_FORCE_SYNC);
zkServer.shutdown();