From 910a1c03124d31f940259682340fef402a42c9ae Mon Sep 17 00:00:00 2001 From: Erick Erickson Date: Sat, 15 Sep 2018 21:26:19 -0700 Subject: [PATCH] SOLR-12028: BadApple and AwaitsFix annotations usage --- .../src/test/org/apache/solr/cloud/DeleteReplicaTest.java | 2 +- .../test/org/apache/solr/cloud/DocValuesNotIndexedTest.java | 3 +-- .../org/apache/solr/cloud/FullSolrCloudDistribCmdsTest.java | 3 +-- .../test/org/apache/solr/cloud/LIRRollingUpdatesTest.java | 6 +++--- .../test/org/apache/solr/cloud/SaslZkACLProviderTest.java | 1 + .../src/test/org/apache/solr/cloud/TestWithCollection.java | 1 + .../src/test/org/apache/solr/cloud/ZkShardTermsTest.java | 1 + .../apache/solr/cloud/api/collections/ShardSplitTest.java | 2 ++ .../cloud/api/collections/TestHdfsCloudBackupRestore.java | 2 +- .../cloud/autoscaling/AutoAddReplicasIntegrationTest.java | 3 +-- .../cloud/autoscaling/ScheduledTriggerIntegrationTest.java | 3 +-- .../cloud/autoscaling/SearchRateTriggerIntegrationTest.java | 1 + .../src/test/org/apache/solr/handler/TestSQLHandler.java | 1 + .../solr/handler/admin/MetricsHistoryHandlerTest.java | 1 + .../solr/metrics/reporters/solr/SolrCloudReportersTest.java | 3 +-- .../apache/solr/client/solrj/impl/CloudSolrClientTest.java | 3 +-- .../org/apache/solr/client/solrj/io/graph/GraphTest.java | 2 +- 17 files changed, 20 insertions(+), 18 deletions(-) diff --git a/solr/core/src/test/org/apache/solr/cloud/DeleteReplicaTest.java b/solr/core/src/test/org/apache/solr/cloud/DeleteReplicaTest.java index a82dd7c2187..5fa3d5650dd 100644 --- a/solr/core/src/test/org/apache/solr/cloud/DeleteReplicaTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/DeleteReplicaTest.java @@ -219,7 +219,7 @@ public class DeleteReplicaTest extends SolrCloudTestCase { @Test @Slow //28-June-2018 @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // 21-May-2018 - @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // added 17-Aug-2018 + // commented 15-Sep-2018 @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // added 17-Aug-2018 public void raceConditionOnDeleteAndRegisterReplica() throws Exception { raceConditionOnDeleteAndRegisterReplica("true"); raceConditionOnDeleteAndRegisterReplica("false"); diff --git a/solr/core/src/test/org/apache/solr/cloud/DocValuesNotIndexedTest.java b/solr/core/src/test/org/apache/solr/cloud/DocValuesNotIndexedTest.java index bbd1389f2ec..51c2cd003ad 100644 --- a/solr/core/src/test/org/apache/solr/cloud/DocValuesNotIndexedTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/DocValuesNotIndexedTest.java @@ -30,7 +30,6 @@ import java.util.Locale; import java.util.Map; import com.carrotsearch.randomizedtesting.rules.SystemPropertiesRestoreRule; -import org.apache.lucene.util.LuceneTestCase; import org.apache.solr.client.solrj.SolrQuery; import org.apache.solr.client.solrj.SolrServerException; import org.apache.solr.client.solrj.impl.CloudSolrClient; @@ -314,7 +313,7 @@ public class DocValuesNotIndexedTest extends SolrCloudTestCase { // make sure all the values for each field are unique. We need to have docs that have values that are _not_ // unique. // 12-Jun-2018 @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // 04-May-2018 - @LuceneTestCase.BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // 2-Aug-2018 + // commented 15-Sep-2018 @LuceneTestCase.BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // 2-Aug-2018 public void testGroupingDVOnly() throws IOException, SolrServerException { List docs = new ArrayList<>(50); for (int idx = 0; idx < 49; ++idx) { diff --git a/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudDistribCmdsTest.java b/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudDistribCmdsTest.java index b31e8f7f7ea..c7cc9e42c22 100644 --- a/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudDistribCmdsTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudDistribCmdsTest.java @@ -21,7 +21,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.LuceneTestCase.Slow; import org.apache.solr.SolrTestCaseJ4.SuppressSSL; import org.apache.solr.client.solrj.SolrClient; @@ -69,7 +68,7 @@ public class FullSolrCloudDistribCmdsTest extends AbstractFullDistribZkTestBase @Test @ShardsFixed(num = 6) - @LuceneTestCase.BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // 2-Aug-2018 + // commented 15-Sep-2018 @LuceneTestCase.BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // 2-Aug-2018 public void test() throws Exception { handle.clear(); handle.put("timestamp", SKIPVAL); diff --git a/solr/core/src/test/org/apache/solr/cloud/LIRRollingUpdatesTest.java b/solr/core/src/test/org/apache/solr/cloud/LIRRollingUpdatesTest.java index 336cef3389d..88be4dbcf7b 100644 --- a/solr/core/src/test/org/apache/solr/cloud/LIRRollingUpdatesTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/LIRRollingUpdatesTest.java @@ -97,7 +97,7 @@ public class LIRRollingUpdatesTest extends SolrCloudTestCase { @Test // 12-Jun-2018 @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // 21-May-2018 - @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // added 09-Aug-2018 + // commented 15-Sep-2018 @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // added 09-Aug-2018 public void testNewReplicaOldLeader() throws Exception { String collection = "testNewReplicaOldLeader"; @@ -165,7 +165,7 @@ public class LIRRollingUpdatesTest extends SolrCloudTestCase { @Test // 12-Jun-2018 @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // 04-May-2018 - @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // added 09-Aug-2018 + // commented 15-Sep-2018 @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // added 09-Aug-2018 public void testNewLeaderOldReplica() throws Exception { // in case of new leader & old replica, new leader can still put old replica into LIR @@ -335,7 +335,7 @@ public class LIRRollingUpdatesTest extends SolrCloudTestCase { @Test // 12-Jun-2018 @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // 04-May-2018 - @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // added 09-Aug-2018 + // commented 15-Sep-2018 @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // added 09-Aug-2018 public void testNewLeaderAndMixedReplicas() throws Exception { testLeaderAndMixedReplicas(false); } diff --git a/solr/core/src/test/org/apache/solr/cloud/SaslZkACLProviderTest.java b/solr/core/src/test/org/apache/solr/cloud/SaslZkACLProviderTest.java index 000d092dd4b..342263341b1 100644 --- a/solr/core/src/test/org/apache/solr/cloud/SaslZkACLProviderTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/SaslZkACLProviderTest.java @@ -115,6 +115,7 @@ public class SaslZkACLProviderTest extends SolrTestCaseJ4 { @Test //commented 9-Aug-2018 @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // 05-Jul-2018 + @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // added 15-Sep-2018 public void testSaslZkACLProvider() throws Exception { // Test with Sasl enabled SolrZkClient zkClient = new SolrZkClientWithACLs(zkServer.getZkAddress(), AbstractZkTestCase.TIMEOUT); diff --git a/solr/core/src/test/org/apache/solr/cloud/TestWithCollection.java b/solr/core/src/test/org/apache/solr/cloud/TestWithCollection.java index b822a2421d5..d21b32bdde3 100644 --- a/solr/core/src/test/org/apache/solr/cloud/TestWithCollection.java +++ b/solr/core/src/test/org/apache/solr/cloud/TestWithCollection.java @@ -411,6 +411,7 @@ public class TestWithCollection extends SolrCloudTestCase { * Tests that when a new node is added to the cluster and autoscaling framework * moves replicas to the new node, we maintain all co-locating guarantees */ + @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // added 15-Sep-2018 public void testNodeAdded() throws Exception { String prefix = "testNodeAdded"; String xyz = prefix + "_xyz"; diff --git a/solr/core/src/test/org/apache/solr/cloud/ZkShardTermsTest.java b/solr/core/src/test/org/apache/solr/cloud/ZkShardTermsTest.java index 22029c1facf..201de2662fb 100644 --- a/solr/core/src/test/org/apache/solr/cloud/ZkShardTermsTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/ZkShardTermsTest.java @@ -52,6 +52,7 @@ public class ZkShardTermsTest extends SolrCloudTestCase { } @Test + @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // added 15-Sep-2018 public void testParticipationOfReplicas() throws IOException, SolrServerException, InterruptedException { String collection = "collection1"; try (ZkShardTerms zkShardTerms = new ZkShardTerms(collection, "shard2", cluster.getZkClient())) { diff --git a/solr/core/src/test/org/apache/solr/cloud/api/collections/ShardSplitTest.java b/solr/core/src/test/org/apache/solr/cloud/api/collections/ShardSplitTest.java index 6619ee519c3..39ae618ab29 100644 --- a/solr/core/src/test/org/apache/solr/cloud/api/collections/ShardSplitTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/api/collections/ShardSplitTest.java @@ -267,6 +267,7 @@ public class ShardSplitTest extends AbstractFullDistribZkTestBase { */ @Test //05-Jul-2018 @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") + @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // added 15-Sep-2018 public void testSplitAfterFailedSplit() throws Exception { waitForThingsToLevelOut(15); @@ -327,6 +328,7 @@ public class ShardSplitTest extends AbstractFullDistribZkTestBase { } @Test + @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // added 15-Sep-2018 public void testSplitMixedReplicaTypes() throws Exception { doSplitMixedReplicaTypes(SolrIndexSplitter.SplitMethod.REWRITE); } diff --git a/solr/core/src/test/org/apache/solr/cloud/api/collections/TestHdfsCloudBackupRestore.java b/solr/core/src/test/org/apache/solr/cloud/api/collections/TestHdfsCloudBackupRestore.java index 2700419748b..e81bc4bbb6c 100644 --- a/solr/core/src/test/org/apache/solr/cloud/api/collections/TestHdfsCloudBackupRestore.java +++ b/solr/core/src/test/org/apache/solr/cloud/api/collections/TestHdfsCloudBackupRestore.java @@ -208,7 +208,7 @@ public class TestHdfsCloudBackupRestore extends AbstractCloudBackupRestoreTestCa } @Override @Test - @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // added 09-Aug-2018 + // commented 15-Sep-2018 @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // added 09-Aug-2018 public void test() throws Exception { super.test(); } diff --git a/solr/core/src/test/org/apache/solr/cloud/autoscaling/AutoAddReplicasIntegrationTest.java b/solr/core/src/test/org/apache/solr/cloud/autoscaling/AutoAddReplicasIntegrationTest.java index e80252fd3cb..b1ac6ee92c1 100644 --- a/solr/core/src/test/org/apache/solr/cloud/autoscaling/AutoAddReplicasIntegrationTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/autoscaling/AutoAddReplicasIntegrationTest.java @@ -23,7 +23,6 @@ import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; -import org.apache.lucene.util.LuceneTestCase; import org.apache.solr.client.solrj.SolrServerException; import org.apache.solr.client.solrj.embedded.JettySolrRunner; import org.apache.solr.client.solrj.request.CollectionAdminRequest; @@ -61,7 +60,7 @@ public class AutoAddReplicasIntegrationTest extends SolrCloudTestCase { @Test // This apparently fails in both subclasses. // 12-Jun-2018 @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") - @LuceneTestCase.BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // 2-Aug-2018 + // commented 15-Sep-2018 @LuceneTestCase.BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // 2-Aug-2018 public void testSimple() throws Exception { JettySolrRunner jetty1 = cluster.getJettySolrRunner(0); JettySolrRunner jetty2 = cluster.getJettySolrRunner(1); diff --git a/solr/core/src/test/org/apache/solr/cloud/autoscaling/ScheduledTriggerIntegrationTest.java b/solr/core/src/test/org/apache/solr/cloud/autoscaling/ScheduledTriggerIntegrationTest.java index 6197dc9913b..8d1fcda4ebe 100644 --- a/solr/core/src/test/org/apache/solr/cloud/autoscaling/ScheduledTriggerIntegrationTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/autoscaling/ScheduledTriggerIntegrationTest.java @@ -27,7 +27,6 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; -import org.apache.lucene.util.LuceneTestCase; import org.apache.solr.client.solrj.SolrClient; import org.apache.solr.client.solrj.SolrRequest; import org.apache.solr.client.solrj.embedded.JettySolrRunner; @@ -73,7 +72,7 @@ public class ScheduledTriggerIntegrationTest extends SolrCloudTestCase { } @Test - @LuceneTestCase.BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // 2-Aug-2018 + // commented 15-Sep-2018 @LuceneTestCase.BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // 2-Aug-2018 public void testScheduledTrigger() throws Exception { CloudSolrClient solrClient = cluster.getSolrClient(); diff --git a/solr/core/src/test/org/apache/solr/cloud/autoscaling/SearchRateTriggerIntegrationTest.java b/solr/core/src/test/org/apache/solr/cloud/autoscaling/SearchRateTriggerIntegrationTest.java index 437b8ce7982..5d7ce999cbf 100644 --- a/solr/core/src/test/org/apache/solr/cloud/autoscaling/SearchRateTriggerIntegrationTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/autoscaling/SearchRateTriggerIntegrationTest.java @@ -274,6 +274,7 @@ public class SearchRateTriggerIntegrationTest extends SolrCloudTestCase { @Test //17-Aug-2018 commented @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // 21-May-2018 + @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // added 15-Sep-2018 public void testBelowSearchRate() throws Exception { CloudSolrClient solrClient = cluster.getSolrClient(); String COLL1 = "belowRate_collection"; diff --git a/solr/core/src/test/org/apache/solr/handler/TestSQLHandler.java b/solr/core/src/test/org/apache/solr/handler/TestSQLHandler.java index b860d6e6272..220d9ec2880 100644 --- a/solr/core/src/test/org/apache/solr/handler/TestSQLHandler.java +++ b/solr/core/src/test/org/apache/solr/handler/TestSQLHandler.java @@ -79,6 +79,7 @@ public class TestSQLHandler extends AbstractFullDistribZkTestBase { @Test //28-June-2018 @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // 21-May-2018 //@LuceneTestCase.BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // 2-Aug-2018 + @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // added 15-Sep-2018 public void doTest() throws Exception { waitForRecoveriesToFinish(false); diff --git a/solr/core/src/test/org/apache/solr/handler/admin/MetricsHistoryHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/admin/MetricsHistoryHandlerTest.java index 735b427eb9d..79bded935f6 100644 --- a/solr/core/src/test/org/apache/solr/handler/admin/MetricsHistoryHandlerTest.java +++ b/solr/core/src/test/org/apache/solr/handler/admin/MetricsHistoryHandlerTest.java @@ -110,6 +110,7 @@ public class MetricsHistoryHandlerTest extends SolrCloudTestCase { } @Test + @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // added 15-Sep-2018 public void testBasic() throws Exception { timeSource.sleep(10000); List> list = handler.getFactory().list(100); diff --git a/solr/core/src/test/org/apache/solr/metrics/reporters/solr/SolrCloudReportersTest.java b/solr/core/src/test/org/apache/solr/metrics/reporters/solr/SolrCloudReportersTest.java index e395fac99f0..359cdf5848c 100644 --- a/solr/core/src/test/org/apache/solr/metrics/reporters/solr/SolrCloudReportersTest.java +++ b/solr/core/src/test/org/apache/solr/metrics/reporters/solr/SolrCloudReportersTest.java @@ -21,7 +21,6 @@ import java.util.Map; import com.codahale.metrics.Metric; import org.apache.commons.io.IOUtils; -import org.apache.lucene.util.LuceneTestCase; import org.apache.solr.client.solrj.request.CollectionAdminRequest; import org.apache.solr.cloud.SolrCloudTestCase; import org.apache.solr.core.CoreContainer; @@ -155,7 +154,7 @@ public class SolrCloudReportersTest extends SolrCloudTestCase { } @Test - @LuceneTestCase.BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // 2-Aug-2018 + // commented 15-Sep-2018 @LuceneTestCase.BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // 2-Aug-2018 public void testDefaultPlugins() throws Exception { String solrXml = IOUtils.toString(SolrCloudReportersTest.class.getResourceAsStream("/solr/solr.xml"), "UTF-8"); configureCluster(2) diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientTest.java index fefe8681149..8570e8ee277 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientTest.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientTest.java @@ -36,7 +36,6 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.LuceneTestCase.Slow; import org.apache.lucene.util.TestUtil; import org.apache.solr.client.solrj.SolrClient; @@ -855,7 +854,7 @@ public class CloudSolrClientTest extends SolrCloudTestCase { * limits the distributed query to locally hosted shards only */ @Test - @LuceneTestCase.BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // 2-Aug-2018 + // commented 15-Sep-2018 @LuceneTestCase.BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // 2-Aug-2018 public void preferReplicaTypesTest() throws Exception { String collectionName = "replicaTypesTestColl"; diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/graph/GraphTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/graph/GraphTest.java index fc24a63e3bb..9e99224a516 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/graph/GraphTest.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/graph/GraphTest.java @@ -72,7 +72,7 @@ public class GraphTest extends SolrCloudTestCase { } @Test - @LuceneTestCase.BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // 2-Aug-2018 + // commented 15-Sep-2018 @LuceneTestCase.BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // 2-Aug-2018 public void testShortestPathStream() throws Exception { new UpdateRequest()