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/01/20 00:49:23 UTC
svn commit: r1559610 - in /lucene/dev/branches/branch_4x: ./ solr/ solr/core/
solr/core/src/test/org/apache/solr/cloud/CollectionsAPIDistributedZkTest.java
Author: markrmiller
Date: Sun Jan 19 23:49:23 2014
New Revision: 1559610
URL: http://svn.apache.org/r1559610
Log:
SOLR-5608: Raise wait for leader timeout from 1000 to 15000
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/core/ (props changed)
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/CollectionsAPIDistributedZkTest.java
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/CollectionsAPIDistributedZkTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/CollectionsAPIDistributedZkTest.java?rev=1559610&r1=1559609&r2=1559610&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/CollectionsAPIDistributedZkTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/CollectionsAPIDistributedZkTest.java Sun Jan 19 23:49:23 2014
@@ -362,10 +362,10 @@ public class CollectionsAPIDistributedZk
String baseUrl = getBaseUrl((HttpSolrServer) clients.get(0));
// now try to remove a collection when a couple of it's nodes are down
if (secondConfigSet) {
- createCollection(null, "halfdeletedcollection2", 3, 2, 6,
+ createCollection(null, "halfdeletedcollection2", 3, 3, 6,
createNewSolrServer("", baseUrl), null, "conf2");
} else {
- createCollection(null, "halfdeletedcollection2", 3, 2, 6,
+ createCollection(null, "halfdeletedcollection2", 3, 3, 6,
createNewSolrServer("", baseUrl), null);
}
@@ -377,7 +377,7 @@ public class CollectionsAPIDistributedZk
// wait for leaders to settle out
for (int i = 1; i < 4; i++) {
- cloudClient.getZkStateReader().getLeaderRetry("halfdeletedcollection2", "shard" + i);
+ cloudClient.getZkStateReader().getLeaderRetry("halfdeletedcollection2", "shard" + i, 15000);
}
baseUrl = getBaseUrl((HttpSolrServer) clients.get(2));