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 2018/12/11 12:11:10 UTC
[3/5] lucene-solr:branch_7x: SOLR-12801: Harden
BasicDistributedZk2Test.
SOLR-12801: Harden BasicDistributedZk2Test.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/3bc5dbce
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/3bc5dbce
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/3bc5dbce
Branch: refs/heads/branch_7x
Commit: 3bc5dbce0122c3c99b3c4c50441a813bc5cd25c3
Parents: 995547d
Author: markrmiller <ma...@apache.org>
Authored: Mon Dec 10 21:25:06 2018 -0600
Committer: markrmiller <ma...@apache.org>
Committed: Tue Dec 11 05:42:08 2018 -0600
----------------------------------------------------------------------
.../org/apache/solr/cloud/BasicDistributedZk2Test.java | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/3bc5dbce/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZk2Test.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZk2Test.java b/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZk2Test.java
index 5091eaf..8b5d15c 100644
--- a/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZk2Test.java
+++ b/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZk2Test.java
@@ -293,9 +293,17 @@ public class BasicDistributedZk2Test extends AbstractFullDistribZkTestBase {
long numFound1 = cloudClient.query(new SolrQuery("*:*")).getResults().getNumFound();
cloudClient.getZkStateReader().getLeaderRetry(DEFAULT_COLLECTION, SHARD1, 60000);
- index_specific(shardToJetty.get(SHARD1).get(1).client.solrClient, id, 1000, i1, 108, t1,
- "specific doc!");
+ try {
+ index_specific(shardToJetty.get(SHARD1).get(1).client.solrClient, id, 1000, i1, 108, t1,
+ "specific doc!");
+ } catch (Exception e) {
+ // wait and try again
+ Thread.sleep(4000);
+ index_specific(shardToJetty.get(SHARD1).get(1).client.solrClient, id, 1000, i1, 108, t1,
+ "specific doc!");
+ }
+
commit();
checkShardConsistency(true, false);