Apache Solr open-source search software
SOLR-16784 Frequent failing CollectionReloadTest (#1662)
Alexf6de83655eb2
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestPullReplica.java b/solr/core/src/test/org/apache/solr/cloud/TestPullReplica.javaindex baaab3d516f..6bc17396b33 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestPullReplica.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestPullReplica.java@@ -128,7 +128,7 @@ public class TestPullReplica extends SolrCloudTestCase {@Repeat(iterations = 30)public void testCreateDelete() throws Exception {try {- switch (2 /*random().nextInt(3)*/) {+ switch (random().nextInt(3)) {case 0:// Sometimes use SolrJCollectionAdminRequest.createCollection(collectionName, "conf", 2, 1, 0, 3)diff --git a/solr/core/src/test/org/apache/solr/cloud/api/collections/CollectionReloadTest.java b/solr/core/src/test/org/apache/solr/cloud/api/collections/CollectionReloadTest.javaindex 3b2baef2d6f..a6c961f5820 100644--- a/solr/core/src/test/org/apache/solr/cloud/api/collections/CollectionReloadTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/api/collections/CollectionReloadTest.java@@ -25,7 +25,6 @@ import org.apache.http.HttpResponse;import org.apache.http.client.methods.HttpGet;import org.apache.http.client.methods.HttpPost;import org.apache.http.entity.StringEntity;-import org.apache.lucene.tests.util.LuceneTestCase.BadApple;import org.apache.solr.SolrTestCaseJ4.SuppressSSL;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.impl.CloudLegacySolrClient;@@ -35,15 +34,12 @@ import org.apache.solr.cloud.SolrCloudTestCase;import org.apache.solr.common.cloud.Replica;import org.apache.solr.common.util.RetryUtil;import org.junit.BeforeClass;-import org.junit.Ignore;import org.junit.Test;import org.slf4j.Logger;import org.slf4j.LoggerFactory;/** Verifies cluster state remains consistent after collection reload. */@SuppressSSL(bugUrl = "https://issues.apache.org/jira/browse/SOLR-5776")-@BadApple(bugUrl = "https://issues.apache.org/jira/browse/SOLR-16784")-@Ignorepublic class CollectionReloadTest extends SolrCloudTestCase {private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());@@ -180,15 +176,14 @@ public class CollectionReloadTest extends SolrCloudTestCase {case 2:log.info("Creating collection with V2 API");// Sometimes use V2 API- url = cluster.getRandomJetty(random()).getBaseUrl().toString() + "/____v2/c";+ url = cluster.getRandomJetty(random()).getBaseUrl().toString() + "/____v2/collections";String requestBody =String.format(Locale.ROOT,- "{create:{name:%s, config:%s, numShards:%s, maxShardsPerNode:%s, nrtReplicas:%s, tlogReplicas:%s, pullReplicas:%s}}",+ "{\"name\":\"%s\", \"config\":\"%s\", \"numShards\":%s, \"nrtReplicas\":%s, \"tlogReplicas\":%s, \"pullReplicas\":%s}",collectionName,"conf",numShards, // numShards- 100, // maxShardsPerNodenrtReplicas,tlogReplicas,pullReplicas);