Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-5880: Start using zookeeper.forceSync=false in tests. 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1579252 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Mark Robert Miller 2014-03-19 15:05:13 +00:00
parent 05a0b55434
commit 07dc96fd0c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
solr/test-framework/src/java/org/apache/solr/cloud/AbstractDistribZkTestBase.java
View File

@ -68,7 +68,7 @@ public abstract class AbstractDistribZkTestBase extends BaseDistributedSearchTes
System.setProperty(ZK_HOST, zkServer.getZkAddress()); System.setProperty(ZK_HOST, zkServer.getZkAddress());
System.setProperty(ENABLE_UPDATE_LOG, "true"); System.setProperty(ENABLE_UPDATE_LOG, "true");
System.setProperty(REMOVE_VERSION_FIELD, "true"); System.setProperty(REMOVE_VERSION_FIELD, "true");
//System.setProperty(ZOOKEEPER_FORCE_SYNC, "false"); System.setProperty(ZOOKEEPER_FORCE_SYNC, "false");
String schema = getSchemaFile(); String schema = getSchemaFile();
if (schema == null) schema = "schema.xml"; if (schema == null) schema = "schema.xml";
@ -223,7 +223,7 @@ public abstract class AbstractDistribZkTestBase extends BaseDistributedSearchTes
System.clearProperty("solr.directoryFactory"); System.clearProperty("solr.directoryFactory");
System.clearProperty("solr.test.sys.prop1"); System.clearProperty("solr.test.sys.prop1");
System.clearProperty("solr.test.sys.prop2"); System.clearProperty("solr.test.sys.prop2");
//System.clearProperty(ZOOKEEPER_FORCE_SYNC); System.clearProperty(ZOOKEEPER_FORCE_SYNC);
resetExceptionIgnores(); resetExceptionIgnores();
super.tearDown(); super.tearDown();

4
solr/test-framework/src/java/org/apache/solr/cloud/AbstractZkTestCase.java
View File

@ -72,7 +72,7 @@ public abstract class AbstractZkTestCase extends SolrTestCaseJ4 {
System.setProperty("solrcloud.skip.autorecovery", "true"); System.setProperty("solrcloud.skip.autorecovery", "true");
System.setProperty("zkHost", zkServer.getZkAddress()); System.setProperty("zkHost", zkServer.getZkAddress());
System.setProperty("jetty.port", "0000"); System.setProperty("jetty.port", "0000");
//System.setProperty(ZOOKEEPER_FORCE_SYNC, "false"); System.setProperty(ZOOKEEPER_FORCE_SYNC, "false");
buildZooKeeper(zkServer.getZkHost(), zkServer.getZkAddress(), SOLRHOME, buildZooKeeper(zkServer.getZkHost(), zkServer.getZkAddress(), SOLRHOME,
"solrconfig.xml", "schema.xml"); "solrconfig.xml", "schema.xml");
@ -154,7 +154,7 @@ public abstract class AbstractZkTestCase extends SolrTestCaseJ4 {
System.clearProperty("solr.test.sys.prop2"); System.clearProperty("solr.test.sys.prop2");
System.clearProperty("solrcloud.skip.autorecovery"); System.clearProperty("solrcloud.skip.autorecovery");
System.clearProperty("jetty.port"); System.clearProperty("jetty.port");
//System.clearProperty(ZOOKEEPER_FORCE_SYNC); System.clearProperty(ZOOKEEPER_FORCE_SYNC);
zkServer.shutdown(); zkServer.shutdown();