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/02 05:43:35 UTC
svn commit: r1573258 - in /lucene/dev/branches/branch_4x: ./ solr/
solr/solrj/
solr/solrj/src/java/org/apache/solr/common/cloud/SolrZkClient.java
solr/test-framework/
solr/test-framework/src/java/org/apache/solr/cloud/AbstractZkTestCase.java
Author: markrmiller
Date: Sun Mar 2 04:43:34 2014
New Revision: 1573258
URL: http://svn.apache.org/r1573258
Log:
tests: raise zk connect timeout when building zk for tests
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/solrj/ (props changed)
lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZkClient.java
lucene/dev/branches/branch_4x/solr/test-framework/ (props changed)
lucene/dev/branches/branch_4x/solr/test-framework/src/java/org/apache/solr/cloud/AbstractZkTestCase.java
Modified: lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZkClient.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZkClient.java?rev=1573258&r1=1573257&r2=1573258&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZkClient.java (original)
+++ lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZkClient.java Sun Mar 2 04:43:34 2014
@@ -22,9 +22,7 @@ import java.io.IOException;
import java.io.StringReader;
import java.io.StringWriter;
import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
import java.util.List;
-import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicLong;
import javax.xml.transform.OutputKeys;
@@ -85,6 +83,10 @@ public class SolrZkClient {
this(zkServerAddress, zkClientTimeout, new DefaultConnectionStrategy(), null);
}
+ public SolrZkClient(String zkServerAddress, int zkClientTimeout, int zkClientConnectTimeout) {
+ this(zkServerAddress, zkClientTimeout, zkClientConnectTimeout, new DefaultConnectionStrategy(), null);
+ }
+
public SolrZkClient(String zkServerAddress, int zkClientTimeout, int zkClientConnectTimeout, OnReconnect onReonnect) {
this(zkServerAddress, zkClientTimeout, zkClientConnectTimeout, new DefaultConnectionStrategy(), onReonnect);
}
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=1573258&r1=1573257&r2=1573258&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 Sun Mar 2 04:43:34 2014
@@ -86,7 +86,7 @@ public abstract class AbstractZkTestCase
// static to share with distrib test
public static void buildZooKeeper(String zkHost, String zkAddress, File solrhome, String config,
String schema) throws Exception {
- SolrZkClient zkClient = new SolrZkClient(zkHost, AbstractZkTestCase.TIMEOUT);
+ SolrZkClient zkClient = new SolrZkClient(zkHost, AbstractZkTestCase.TIMEOUT, 45000, null);
zkClient.makePath("/solr", false, true);
zkClient.close();