You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ab...@apache.org on 2017/11/17 08:33:34 UTC
[13/40] lucene-solr:jira/solr-11285-sim: SOLR-11638: Fix
CloudSolrClientTest periodic failures after SOLR-11507
SOLR-11638: Fix CloudSolrClientTest periodic failures after SOLR-11507
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/30453491
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/30453491
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/30453491
Branch: refs/heads/jira/solr-11285-sim
Commit: 304534914099718480c1463629d1a631261986bd
Parents: eec25ea
Author: Shalin Shekhar Mangar <sh...@apache.org>
Authored: Mon Nov 13 15:50:45 2017 +0530
Committer: Shalin Shekhar Mangar <sh...@apache.org>
Committed: Mon Nov 13 15:50:45 2017 +0530
----------------------------------------------------------------------
solr/CHANGES.txt | 3 ++-
.../org/apache/solr/client/solrj/impl/CloudSolrClientTest.java | 6 +++++-
2 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/30453491/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 6c8dab7..d151353 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -157,7 +157,8 @@ Other Changes
* SOLR-10469: Move CloudSolrClient.setParallelUpdates to its Builder. (David Smiley)
-* SOLR-11507: Randomize SolrTestCaseJ4.CloudSolrClientBuilder more, and simplify it. (David Smiley)
+* SOLR-11507: SOLR-11638: Randomize SolrTestCaseJ4.CloudSolrClientBuilder more, and simplify it.
+ (Jason Gerlowski, David Smiley)
================== 7.1.0 ==================
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/30453491/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientTest.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientTest.java
index ffe59cf..c0580ed 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientTest.java
@@ -812,7 +812,11 @@ public class CloudSolrClientTest extends SolrCloudTestCase {
final String old_leader_core_node_name = slice.getLeader().getName();
// NOTE: creating our own CloudSolrClient whose settings we can muck with...
- try (CloudSolrClient stale_client = getCloudSolrClient(cluster.getZkServer().getZkAddress())) {
+ try (CloudSolrClient stale_client = new CloudSolrClientBuilder()
+ .withZkHost(cluster.getZkServer().getZkAddress())
+ .sendDirectUpdatesToAnyShardReplica()
+ .withParallelUpdates(true)
+ .build()) {
// don't let collection cache entries get expired, even on a slow machine...
stale_client.setCollectionCacheTTl(Integer.MAX_VALUE);
stale_client.setDefaultCollection(COL);