Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-12801: Harden CollectionsAPISolrJTest#testCreateCollWithDefaultClusterPropertiesOldFormat.

This commit is contained in:
markrmiller 2018-12-09 18:50:47 -06:00
parent 1d5ae9857f
commit 665517d3bf
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
solr/core/src/test/org/apache/solr/cloud/CollectionsAPISolrJTest.java
View File

@ -75,7 +75,6 @@ public class CollectionsAPISolrJTest extends SolrCloudTestCase {
// clear any persisted auto scaling configuration // clear any persisted auto scaling configuration
zkClient().setData(SOLR_AUTOSCALING_CONF_PATH, Utils.toJSON(new ZkNodeProps()), true); zkClient().setData(SOLR_AUTOSCALING_CONF_PATH, Utils.toJSON(new ZkNodeProps()), true);
cluster.deleteAllCollections();
final ClusterProperties props = new ClusterProperties(zkClient()); final ClusterProperties props = new ClusterProperties(zkClient());
CollectionAdminRequest.setClusterProperty(ZkStateReader.LEGACY_CLOUD, null).process(cluster.getSolrClient()); CollectionAdminRequest.setClusterProperty(ZkStateReader.LEGACY_CLOUD, null).process(cluster.getSolrClient());
@ -130,7 +129,7 @@ public class CollectionsAPISolrJTest extends SolrCloudTestCase {
.build() .build()
.process(cluster.getSolrClient()); .process(cluster.getSolrClient());
for (int i = 0; i < 30; i++) { for (int i = 0; i < 300; i++) {
Map m = cluster.getSolrClient().getZkStateReader().getClusterProperty(COLLECTION_DEF, null); Map m = cluster.getSolrClient().getZkStateReader().getClusterProperty(COLLECTION_DEF, null);
if (m != null) break; if (m != null) break;
Thread.sleep(10); Thread.sleep(10);