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 2011/12/31 18:26:04 UTC
svn commit: r1226143 - in /lucene/dev/branches/solrcloud/solr/core/src:
java/org/apache/solr/update/processor/DistributedUpdateProcessor.java
test/org/apache/solr/cloud/AbstractZkTestCase.java
Author: markrmiller
Date: Sat Dec 31 17:26:04 2011
New Revision: 1226143
URL: http://svn.apache.org/viewvc?rev=1226143&view=rev
Log:
do not do auto recovery in some tests
Modified:
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java
lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/AbstractZkTestCase.java
Modified: lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java?rev=1226143&r1=1226142&r2=1226143&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java (original)
+++ lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java Sat Dec 31 17:26:04 2011
@@ -625,7 +625,6 @@ public class DistributedUpdateProcessor
if (zkEnabled) {
ModifiableSolrParams params = new ModifiableSolrParams(req.getParams());
- System.out.println("distrib commit?");
if (!params.getBool(COMMIT_END_POINT, false)) {
params.set(COMMIT_END_POINT, true);
@@ -634,7 +633,7 @@ public class DistributedUpdateProcessor
String shardZkNodeName = nodeName + "_" + req.getCore().getName();
urls = getReplicaUrls(req, req.getCore().getCoreDescriptor()
.getCloudDescriptor().getCollectionName(), shardZkNodeName);
- System.out.println("send commit to:" + urls);
+
if (urls != null) {
cmdDistrib.distribCommit(cmd, urls, params);
finish();
Modified: lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/AbstractZkTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/AbstractZkTestCase.java?rev=1226143&r1=1226142&r2=1226143&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/AbstractZkTestCase.java (original)
+++ lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/AbstractZkTestCase.java Sat Dec 31 17:26:04 2011
@@ -58,6 +58,7 @@ public abstract class AbstractZkTestCase
zkServer = new ZkTestServer(zkDir);
zkServer.run();
+ System.setProperty("solrcloud.skip.autorecovery", "true");
System.setProperty("zkHost", zkServer.getZkAddress());
System.setProperty("hostPort", "0000");
@@ -120,7 +121,7 @@ public abstract class AbstractZkTestCase
System.clearProperty("zkHost");
System.clearProperty("solr.test.sys.prop1");
System.clearProperty("solr.test.sys.prop2");
-
+ System.clearProperty("solrcloud.skip.autorecovery");
// wait just a bit for any zk client threads to outlast timeout
Thread.sleep(2000);
}