From 0aaf5432089075cf3847508ae83de76ee5e44b97 Mon Sep 17 00:00:00 2001 From: Erick Erickson Date: Fri, 10 May 2019 13:56:04 -0700 Subject: [PATCH] SOLR-13454: Investigate ReindexCollectionTest failures. I missed a place where I should have called the bandaid code --- .../src/test/org/apache/solr/cloud/ReindexCollectionTest.java | 3 +++ .../src/java/org/apache/solr/SolrTestCaseJ4.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/solr/core/src/test/org/apache/solr/cloud/ReindexCollectionTest.java b/solr/core/src/test/org/apache/solr/cloud/ReindexCollectionTest.java index 354d34cc573..e6dcc352382 100644 --- a/solr/core/src/test/org/apache/solr/cloud/ReindexCollectionTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/ReindexCollectionTest.java @@ -385,6 +385,9 @@ public class ReindexCollectionTest extends SolrCloudTestCase { solrClient.commit(collection); // verify the docs exist QueryResponse rsp = solrClient.query(collection, params(CommonParams.Q, "*:*")); + SolrTestCaseJ4.Solr11035BandAid(solrClient, collection, "id", NUM_DOCS, "*:*", + "ReindexCollectionTest.indexDocs", true); + assertEquals("num docs", NUM_DOCS, rsp.getResults().getNumFound()); } diff --git a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java index e752c7a6a63..da8520eb0bc 100644 --- a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java +++ b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java @@ -3083,7 +3083,7 @@ public abstract class SolrTestCaseJ4 extends SolrTestCase { log.error("Dumping response" + rsp.toString()); assertEquals("Solr11035BandAid failed, counts differ after updates:", found, expectedDocCount); } else if (failAnyway) { - fail("failAnyway == true, would have successfully repaired the collection: '" + collection + fail("Solr11035BandAid failAnyway == true, would have successfully repaired the collection: '" + collection + "' extra info: '" + tag + "'"); } }