You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ro...@apache.org on 2016/09/21 10:16:27 UTC
[1/2] lucene-solr:master: SOLR-9305,
SOLR-9390: Don't use directToLeaders updates in partition tests (see
SOLR-9512)
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x fdbeee974 -> bae66f7cc
refs/heads/master 3acfa08ae -> d326adc8b
SOLR-9305, SOLR-9390: Don't use directToLeaders updates in partition tests (see SOLR-9512)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/d326adc8
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/d326adc8
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/d326adc8
Branch: refs/heads/master
Commit: d326adc8bfa33432d50293402a39454d60e070e4
Parents: 3acfa08
Author: Alan Woodward <ro...@apache.org>
Authored: Wed Sep 21 10:57:50 2016 +0100
Committer: Alan Woodward <ro...@apache.org>
Committed: Wed Sep 21 10:57:59 2016 +0100
----------------------------------------------------------------------
.../org/apache/solr/cloud/HttpPartitionTest.java | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d326adc8/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.java b/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.java
index 63dab3b..faf3309 100644
--- a/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.java
@@ -35,6 +35,7 @@ import org.apache.solr.JSONTestUtil;
import org.apache.solr.SolrTestCaseJ4.SuppressSSL;
import org.apache.solr.client.solrj.SolrServerException;
import org.apache.solr.client.solrj.embedded.JettySolrRunner;
+import org.apache.solr.client.solrj.impl.CloudSolrClient;
import org.apache.solr.client.solrj.impl.HttpSolrClient;
import org.apache.solr.client.solrj.request.CollectionAdminRequest;
import org.apache.solr.client.solrj.request.QueryRequest;
@@ -80,7 +81,20 @@ public class HttpPartitionTest extends AbstractFullDistribZkTestBase {
sliceCount = 2;
fixShardCount(3);
}
-
+
+ /**
+ * We need to turn off directUpdatesToLeadersOnly due to SOLR-9512
+ */
+ @Override
+ protected CloudSolrClient createCloudClient(String defaultCollection) {
+ CloudSolrClient client = getCloudSolrClient(zkServer.getZkAddress(), false);
+ client.setParallelUpdates(random().nextBoolean());
+ if (defaultCollection != null) client.setDefaultCollection(defaultCollection);
+ client.getLbClient().setConnectionTimeout(30000);
+ client.getLbClient().setSoTimeout(60000);
+ return client;
+ }
+
/**
* Overrides the parent implementation to install a SocketProxy in-front of the Jetty server.
*/
[2/2] lucene-solr:branch_6x: SOLR-9305,
SOLR-9390: Don't use directToLeaders updates in partition tests (see
SOLR-9512)
Posted by ro...@apache.org.
SOLR-9305, SOLR-9390: Don't use directToLeaders updates in partition tests (see SOLR-9512)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/bae66f7c
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/bae66f7c
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/bae66f7c
Branch: refs/heads/branch_6x
Commit: bae66f7cca8cff796d142eb19585d8e79fae34f8
Parents: fdbeee9
Author: Alan Woodward <ro...@apache.org>
Authored: Wed Sep 21 10:57:50 2016 +0100
Committer: Alan Woodward <ro...@apache.org>
Committed: Wed Sep 21 10:58:12 2016 +0100
----------------------------------------------------------------------
.../org/apache/solr/cloud/HttpPartitionTest.java | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/bae66f7c/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.java b/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.java
index 1551c11..2038111 100644
--- a/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.java
@@ -35,6 +35,7 @@ import org.apache.solr.JSONTestUtil;
import org.apache.solr.SolrTestCaseJ4.SuppressSSL;
import org.apache.solr.client.solrj.SolrServerException;
import org.apache.solr.client.solrj.embedded.JettySolrRunner;
+import org.apache.solr.client.solrj.impl.CloudSolrClient;
import org.apache.solr.client.solrj.impl.HttpSolrClient;
import org.apache.solr.client.solrj.request.CollectionAdminRequest;
import org.apache.solr.client.solrj.request.QueryRequest;
@@ -80,7 +81,20 @@ public class HttpPartitionTest extends AbstractFullDistribZkTestBase {
sliceCount = 2;
fixShardCount(3);
}
-
+
+ /**
+ * We need to turn off directUpdatesToLeadersOnly due to SOLR-9512
+ */
+ @Override
+ protected CloudSolrClient createCloudClient(String defaultCollection) {
+ CloudSolrClient client = getCloudSolrClient(zkServer.getZkAddress(), false);
+ client.setParallelUpdates(random().nextBoolean());
+ if (defaultCollection != null) client.setDefaultCollection(defaultCollection);
+ client.getLbClient().setConnectionTimeout(30000);
+ client.getLbClient().setSoTimeout(60000);
+ return client;
+ }
+
/**
* Overrides the parent implementation to install a SocketProxy in-front of the Jetty server.
*/