From 1fe45606b91b368b5fcd20e3c86e401ab4f9c6a6 Mon Sep 17 00:00:00 2001 From: Erick Erickson Date: Mon, 26 Feb 2018 20:33:41 -0800 Subject: [PATCH] SOLR-12028: BadApple and AwaitsFix annotations usage --- build.xml | 11 +++++++++++ dev-tools/scripts/smokeTestRelease.py | 3 +++ lucene/common-build.xml | 1 + .../org/apache/lucene/spatial3d/TestGeo3DPoint.java | 1 + .../java/org/apache/lucene/util/LuceneTestCase.java | 11 ++++++----- solr/CHANGES.txt | 2 ++ .../org/apache/solr/ltr/TestLTRReRankingPipeline.java | 2 +- .../apache/solr/cloud/DocValuesNotIndexedTest.java | 1 + .../test/org/apache/solr/cloud/ForceLeaderTest.java | 1 + .../test/org/apache/solr/cloud/HttpPartitionTest.java | 1 + .../solr/cloud/LeaderFailoverAfterPartitionTest.java | 1 + .../LeaderInitiatedRecoveryOnShardRestartTest.java | 4 ++-- .../org/apache/solr/cloud/MoveReplicaHDFSTest.java | 1 + .../apache/solr/cloud/PeerSyncReplicationTest.java | 1 + .../apache/solr/cloud/ReplaceNodeNoTargetTest.java | 1 + .../solr/cloud/SharedFSAutoReplicaFailoverTest.java | 1 + .../solr/cloud/TestAuthenticationFramework.java | 1 + .../test/org/apache/solr/cloud/TestPrepRecovery.java | 3 +++ .../test/org/apache/solr/cloud/TestPullReplica.java | 1 + .../org/apache/solr/cloud/TestSegmentSorting.java | 2 ++ .../solr/cloud/TestStressCloudBlindAtomicUpdates.java | 3 +++ .../test/org/apache/solr/cloud/TestTlogReplica.java | 1 + .../test/org/apache/solr/cloud/TestUtilizeNode.java | 1 + .../test/org/apache/solr/cloud/ZkControllerTest.java | 2 +- .../test/org/apache/solr/cloud/ZkSolrClientTest.java | 3 +++ .../solr/cloud/api/collections/ShardSplitTest.java | 1 + .../autoscaling/AutoAddReplicasIntegrationTest.java | 2 ++ .../cloud/autoscaling/AutoScalingHandlerTest.java | 1 + .../solr/cloud/autoscaling/ComputePlanActionTest.java | 1 + .../cloud/autoscaling/TriggerIntegrationTest.java | 3 +-- .../autoscaling/sim/TestGenericDistributedQueue.java | 2 ++ .../solr/cloud/autoscaling/sim/TestLargeCluster.java | 3 ++- .../cloud/autoscaling/sim/TestTriggerIntegration.java | 3 +++ .../org/apache/solr/cloud/cdcr/CdcrBootstrapTest.java | 2 ++ .../cloud/cdcr/CdcrReplicationDistributedZkTest.java | 2 +- .../cloud/hdfs/HdfsChaosMonkeyNothingIsSafeTest.java | 2 +- .../test/org/apache/solr/core/TestJmxIntegration.java | 2 +- .../apache/solr/handler/TestReplicationHandler.java | 5 ++++- .../org/apache/solr/handler/TestReqParamsAPI.java | 1 - .../handler/admin/AutoscalingHistoryHandlerTest.java | 1 + .../apache/solr/rest/TestManagedResourceStorage.java | 4 ++-- .../org/apache/solr/store/hdfs/HdfsDirectoryTest.java | 1 + .../processor/AtomicUpdateProcessorFactoryTest.java | 2 +- .../client/solrj/io/stream/StreamExpressionTest.java | 3 ++- 44 files changed, 80 insertions(+), 21 deletions(-) diff --git a/build.xml b/build.xml index a5f09e48711..ceff8d2a36b 100755 --- a/build.xml +++ b/build.xml @@ -618,6 +618,16 @@ Test args: [${args}] + + + + + + + + + + @@ -627,6 +637,7 @@ Test args: [${args}] + diff --git a/dev-tools/scripts/smokeTestRelease.py b/dev-tools/scripts/smokeTestRelease.py index b8989c9aa17..a4e7135ecc0 100644 --- a/dev-tools/scripts/smokeTestRelease.py +++ b/dev-tools/scripts/smokeTestRelease.py @@ -1467,6 +1467,9 @@ def main(): def smokeTest(java, baseURL, gitRevision, version, tmpDir, isSigned, testArgs): startTime = datetime.datetime.now() + + # disable flakey tests for smoke-tester runs: + testArgs = '-Dtests.badapples=false %s' % testArgs if FORCE_CLEAN: if os.path.exists(tmpDir): diff --git a/lucene/common-build.xml b/lucene/common-build.xml index 4fa59ac9364..86e4288f061 100644 --- a/lucene/common-build.xml +++ b/lucene/common-build.xml @@ -1401,6 +1401,7 @@ ant beast -Dtests.dups=N -Dtests.iters=M -Dbeast.iters=P \ ant -Dtests.nightly=[false] - nightly test group (@Nightly) ant -Dtests.weekly=[false] - weekly tests (@Weekly) ant -Dtests.awaitsfix=[false] - known issue (@AwaitsFix) +ant -Dtests.badapples=[true] - flakey tests (@BadApple) ant -Dtests.slow=[true] - slow tests (@Slow) # An alternative way to select just one (or more) groups of tests diff --git a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/TestGeo3DPoint.java b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/TestGeo3DPoint.java index e05ce766b2b..9e76cea55e1 100644 --- a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/TestGeo3DPoint.java +++ b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/TestGeo3DPoint.java @@ -477,6 +477,7 @@ public class TestGeo3DPoint extends LuceneTestCase { } @Nightly + @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") public void testRandomBig() throws Exception { doTestRandom(200000); } diff --git a/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java index 3d8d346104f..f2b3da0d5ec 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java @@ -282,19 +282,20 @@ public abstract class LuceneTestCase extends Assert { public @interface Slow {} /** - * Annotation for tests that fail frequently and should - * be moved to a "vault" plan in Jenkins. + * Annotation for tests that fail frequently and are not executed in Jenkins builds + * to not spam mailing lists with false reports. * - * Tests annotated with this will be turned off by default. If you want to enable + * Tests are turned on for developers by default. If you want to disable * them, set: * 
-   * -Dtests.badapples=true
+   * -Dtests.badapples=false
    *
+ * (or do this through {@code ~./lucene.build.properties}). */ @Documented @Inherited @Retention(RetentionPolicy.RUNTIME) - @TestGroup(enabled = false, sysProperty = SYSPROP_BADAPPLES) + @TestGroup(enabled = true, sysProperty = SYSPROP_BADAPPLES) public @interface BadApple { /** Point to JIRA entry. */ public String bugUrl(); diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index 1bc4bfffd2d..3a297e00eca 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -322,6 +322,8 @@ Other Changes * SOLR-10809: Get precommit lint warnings out of Solr core (Erick Erickson) +* SOLR-12028: BadApple and AwaitsFix annotations usage (Erick Erickson, Uwe Schindler) + ================== 7.2.1 ================== Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release. diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestLTRReRankingPipeline.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestLTRReRankingPipeline.java index de978949b06..d55262df2de 100644 --- a/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestLTRReRankingPipeline.java +++ b/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestLTRReRankingPipeline.java @@ -163,7 +163,7 @@ public class TestLTRReRankingPipeline extends LuceneTestCase { } - @AwaitsFix(bugUrl = "https://issues.apache.org/jira/browse/SOLR-11134") + @BadApple(bugUrl = "https://issues.apache.org/jira/browse/SOLR-12028, https://issues.apache.org/jira/browse/SOLR-11134") @Test public void testDifferentTopN() throws IOException { final Directory dir = newDirectory(); 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 3f0fa473451..058cd0ef65c 100644 --- a/solr/core/src/test/org/apache/solr/cloud/DocValuesNotIndexedTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/DocValuesNotIndexedTest.java @@ -269,6 +269,7 @@ public class DocValuesNotIndexedTest extends SolrCloudTestCase { } @Test + @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") public void testGroupingDocAbsent() throws IOException, SolrServerException { List docs = new ArrayList<>(4); docs.add(makeGSDoc(2, fieldsToTestGroupSortFirst, null)); diff --git a/solr/core/src/test/org/apache/solr/cloud/ForceLeaderTest.java b/solr/core/src/test/org/apache/solr/cloud/ForceLeaderTest.java index 46ecdb67061..fa4104b3c6d 100644 --- a/solr/core/src/test/org/apache/solr/cloud/ForceLeaderTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/ForceLeaderTest.java @@ -225,6 +225,7 @@ public class ForceLeaderTest extends HttpPartitionTest { @Test @Slow //TODO remove in SOLR-11812 + @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") public void testReplicasInLIRNoLeader() throws Exception { handle.put("maxScore", SKIPVAL); handle.put("timestamp", SKIPVAL); diff --git a/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.java b/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.java index a18aa313f9c..3d07edcce46 100644 --- a/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.java @@ -123,6 +123,7 @@ public class HttpPartitionTest extends AbstractFullDistribZkTestBase { } @Test + @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") public void test() throws Exception { waitForThingsToLevelOut(30000); diff --git a/solr/core/src/test/org/apache/solr/cloud/LeaderFailoverAfterPartitionTest.java b/solr/core/src/test/org/apache/solr/cloud/LeaderFailoverAfterPartitionTest.java index 6a427c96819..40aea97227a 100644 --- a/solr/core/src/test/org/apache/solr/cloud/LeaderFailoverAfterPartitionTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/LeaderFailoverAfterPartitionTest.java @@ -49,6 +49,7 @@ public class LeaderFailoverAfterPartitionTest extends HttpPartitionTest { @Test + @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") public void test() throws Exception { waitForThingsToLevelOut(30000); diff --git a/solr/core/src/test/org/apache/solr/cloud/LeaderInitiatedRecoveryOnShardRestartTest.java b/solr/core/src/test/org/apache/solr/cloud/LeaderInitiatedRecoveryOnShardRestartTest.java index 12bde1724ef..9d2af90058c 100644 --- a/solr/core/src/test/org/apache/solr/cloud/LeaderInitiatedRecoveryOnShardRestartTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/LeaderInitiatedRecoveryOnShardRestartTest.java @@ -20,9 +20,9 @@ import java.lang.invoke.MethodHandles; import java.util.Map; import java.util.Properties; +import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.LuceneTestCase.Nightly; import org.apache.lucene.util.LuceneTestCase.Slow; -import org.apache.lucene.util.LuceneTestCase.AwaitsFix; import org.apache.solr.client.solrj.SolrQuery; import org.apache.solr.client.solrj.embedded.JettySolrRunner; import org.apache.solr.client.solrj.impl.HttpSolrClient; @@ -46,7 +46,7 @@ import org.slf4j.LoggerFactory; @Slow @Nightly -@AwaitsFix(bugUrl = "https://issues.apache.org/jira/browse/SOLR-10071") +@LuceneTestCase.BadApple(bugUrl = "https://issues.apache.org/jira/browse/SOLR-10071") @Deprecated public class LeaderInitiatedRecoveryOnShardRestartTest extends AbstractFullDistribZkTestBase { private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); diff --git a/solr/core/src/test/org/apache/solr/cloud/MoveReplicaHDFSTest.java b/solr/core/src/test/org/apache/solr/cloud/MoveReplicaHDFSTest.java index f5e9e7ed879..89d196ed531 100644 --- a/solr/core/src/test/org/apache/solr/cloud/MoveReplicaHDFSTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/MoveReplicaHDFSTest.java @@ -64,6 +64,7 @@ public class MoveReplicaHDFSTest extends MoveReplicaTest { } @Test + @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") public void testNormalFailedMove() throws Exception { inPlaceMove = false; testFailedMove(); diff --git a/solr/core/src/test/org/apache/solr/cloud/PeerSyncReplicationTest.java b/solr/core/src/test/org/apache/solr/cloud/PeerSyncReplicationTest.java index 3dac890abc4..d4776d72f9e 100644 --- a/solr/core/src/test/org/apache/solr/cloud/PeerSyncReplicationTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/PeerSyncReplicationTest.java @@ -109,6 +109,7 @@ public class PeerSyncReplicationTest extends AbstractFullDistribZkTestBase { } @Test + @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") public void test() throws Exception { handle.clear(); handle.put("timestamp", SKIPVAL); diff --git a/solr/core/src/test/org/apache/solr/cloud/ReplaceNodeNoTargetTest.java b/solr/core/src/test/org/apache/solr/cloud/ReplaceNodeNoTargetTest.java index 3a6cea0aa3b..ff8b9c481c7 100644 --- a/solr/core/src/test/org/apache/solr/cloud/ReplaceNodeNoTargetTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/ReplaceNodeNoTargetTest.java @@ -55,6 +55,7 @@ public class ReplaceNodeNoTargetTest extends SolrCloudTestCase { @Test + @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") public void test() throws Exception { cluster.waitForAllNodes(5000); String coll = "replacenodetest_coll_notarget"; diff --git a/solr/core/src/test/org/apache/solr/cloud/SharedFSAutoReplicaFailoverTest.java b/solr/core/src/test/org/apache/solr/cloud/SharedFSAutoReplicaFailoverTest.java index 457af81412c..5493b35b3aa 100644 --- a/solr/core/src/test/org/apache/solr/cloud/SharedFSAutoReplicaFailoverTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/SharedFSAutoReplicaFailoverTest.java @@ -137,6 +137,7 @@ public class SharedFSAutoReplicaFailoverTest extends AbstractFullDistribZkTestBa @Test @ShardsFixed(num = 4) + @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") public void test() throws Exception { try { // to keep uncommitted docs during failover diff --git a/solr/core/src/test/org/apache/solr/cloud/TestAuthenticationFramework.java b/solr/core/src/test/org/apache/solr/cloud/TestAuthenticationFramework.java index 4f0076c2b39..0615289b888 100644 --- a/solr/core/src/test/org/apache/solr/cloud/TestAuthenticationFramework.java +++ b/solr/core/src/test/org/apache/solr/cloud/TestAuthenticationFramework.java @@ -70,6 +70,7 @@ public class TestAuthenticationFramework extends SolrCloudTestCase { } @Test + @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") public void testBasics() throws Exception { collectionCreateSearchDeleteTwice(); diff --git a/solr/core/src/test/org/apache/solr/cloud/TestPrepRecovery.java b/solr/core/src/test/org/apache/solr/cloud/TestPrepRecovery.java index a80565bae81..a7f0dbf6e02 100644 --- a/solr/core/src/test/org/apache/solr/cloud/TestPrepRecovery.java +++ b/solr/core/src/test/org/apache/solr/cloud/TestPrepRecovery.java @@ -49,6 +49,7 @@ public class TestPrepRecovery extends SolrCloudTestCase { } @Test + @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") public void testLeaderUnloaded() throws Exception { CloudSolrClient solrClient = cluster.getSolrClient(); @@ -83,6 +84,8 @@ public class TestPrepRecovery extends SolrCloudTestCase { collectionName, clusterShape(1, 3)); } + @Test + @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") public void testLeaderNotResponding() throws Exception { CloudSolrClient solrClient = cluster.getSolrClient(); diff --git a/solr/core/src/test/org/apache/solr/cloud/TestPullReplica.java b/solr/core/src/test/org/apache/solr/cloud/TestPullReplica.java index e1539982301..146f5c0ccd5 100644 --- a/solr/core/src/test/org/apache/solr/cloud/TestPullReplica.java +++ b/solr/core/src/test/org/apache/solr/cloud/TestPullReplica.java @@ -213,6 +213,7 @@ public class TestPullReplica extends SolrCloudTestCase { } @SuppressWarnings("unchecked") + @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") public void testAddDocs() throws Exception { int numPullReplicas = 1 + random().nextInt(3); CollectionAdminRequest.createCollection(collectionName, "conf", 1, 1, 0, numPullReplicas) diff --git a/solr/core/src/test/org/apache/solr/cloud/TestSegmentSorting.java b/solr/core/src/test/org/apache/solr/cloud/TestSegmentSorting.java index fa2449dae8c..1f4433bf31f 100644 --- a/solr/core/src/test/org/apache/solr/cloud/TestSegmentSorting.java +++ b/solr/core/src/test/org/apache/solr/cloud/TestSegmentSorting.java @@ -35,6 +35,7 @@ import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Rule; +import org.junit.Test; import org.junit.rules.TestName; @@ -91,6 +92,7 @@ public class TestSegmentSorting extends SolrCloudTestCase { } + @Test@BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") public void testSegmentTerminateEarly() throws Exception { final SegmentTerminateEarlyTestState tstes = new SegmentTerminateEarlyTestState(random()); diff --git a/solr/core/src/test/org/apache/solr/cloud/TestStressCloudBlindAtomicUpdates.java b/solr/core/src/test/org/apache/solr/cloud/TestStressCloudBlindAtomicUpdates.java index 8f917d20936..58e379e9f3f 100644 --- a/solr/core/src/test/org/apache/solr/cloud/TestStressCloudBlindAtomicUpdates.java +++ b/solr/core/src/test/org/apache/solr/cloud/TestStressCloudBlindAtomicUpdates.java @@ -56,6 +56,7 @@ import org.apache.solr.util.TestInjection; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; +import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -194,6 +195,8 @@ public class TestStressCloudBlindAtomicUpdates extends SolrCloudTestCase { checkField(field); } + @Test + @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") public void test_dv_stored() throws Exception { String field = "long_dv_stored"; checkExpectedSchemaField(map("name", field, diff --git a/solr/core/src/test/org/apache/solr/cloud/TestTlogReplica.java b/solr/core/src/test/org/apache/solr/cloud/TestTlogReplica.java index 4ac9f02b091..d8ed4a636e0 100644 --- a/solr/core/src/test/org/apache/solr/cloud/TestTlogReplica.java +++ b/solr/core/src/test/org/apache/solr/cloud/TestTlogReplica.java @@ -519,6 +519,7 @@ public class TestTlogReplica extends SolrCloudTestCase { } @SuppressWarnings("unchecked") + @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") public void testRecovery() throws Exception { boolean useKill = random().nextBoolean(); createAndWaitForCollection(1, 0, 2, 0); diff --git a/solr/core/src/test/org/apache/solr/cloud/TestUtilizeNode.java b/solr/core/src/test/org/apache/solr/cloud/TestUtilizeNode.java index d86ba52b351..07868aa75af 100644 --- a/solr/core/src/test/org/apache/solr/cloud/TestUtilizeNode.java +++ b/solr/core/src/test/org/apache/solr/cloud/TestUtilizeNode.java @@ -63,6 +63,7 @@ public class TestUtilizeNode extends SolrCloudTestCase { } @Test + @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") public void test() throws Exception { cluster.waitForAllNodes(5000); int REPLICATION = 2; diff --git a/solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.java b/solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.java index d17d77919e8..d25f80aeb68 100644 --- a/solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.java @@ -251,7 +251,7 @@ public class ZkControllerTest extends SolrTestCaseJ4 { } } - @AwaitsFix(bugUrl = "https://issues.apache.org/jira/browse/SOLR-7736") + @BadApple(bugUrl = "https://issues.apache.org/jira/browse/SOLR-12028, https://issues.apache.org/jira/browse/SOLR-7736") public void testPublishAndWaitForDownStates() throws Exception { String zkDir = createTempDir("testPublishAndWaitForDownStates").toFile().getAbsolutePath(); CoreContainer cc = null; diff --git a/solr/core/src/test/org/apache/solr/cloud/ZkSolrClientTest.java b/solr/core/src/test/org/apache/solr/cloud/ZkSolrClientTest.java index fc40395b7f0..04cc8e345ce 100644 --- a/solr/core/src/test/org/apache/solr/cloud/ZkSolrClientTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/ZkSolrClientTest.java @@ -30,6 +30,7 @@ import org.apache.zookeeper.WatchedEvent; import org.apache.zookeeper.Watcher; import org.junit.AfterClass; import org.junit.BeforeClass; +import org.junit.Test; public class ZkSolrClientTest extends SolrTestCaseJ4 { @@ -221,6 +222,8 @@ public class ZkSolrClientTest extends SolrTestCaseJ4 { } } + @Test + @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") public void testMultipleWatchesAsync() throws Exception { try (ZkConnection conn = new ZkConnection ()) { final SolrZkClient zkClient = conn.getClient(); 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 6d3ce4e3393..866deef0595 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 @@ -90,6 +90,7 @@ public class ShardSplitTest extends BasicDistributedZkTest { } @Test + @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") public void test() throws Exception { waitForThingsToLevelOut(15); 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 e3df94b7da1..b1de714866b 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 @@ -57,6 +57,8 @@ public class AutoAddReplicasIntegrationTest extends SolrCloudTestCase { } @Test + // This apparently fails in both subclasses. + @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") 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/AutoScalingHandlerTest.java b/solr/core/src/test/org/apache/solr/cloud/autoscaling/AutoScalingHandlerTest.java index cf3bff39725..78b12742786 100644 --- a/solr/core/src/test/org/apache/solr/cloud/autoscaling/AutoScalingHandlerTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/autoscaling/AutoScalingHandlerTest.java @@ -556,6 +556,7 @@ public class AutoScalingHandlerTest extends SolrCloudTestCase { } @Test + @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") public void testReadApi() throws Exception { CloudSolrClient solrClient = cluster.getSolrClient(); // first trigger diff --git a/solr/core/src/test/org/apache/solr/cloud/autoscaling/ComputePlanActionTest.java b/solr/core/src/test/org/apache/solr/cloud/autoscaling/ComputePlanActionTest.java index 579d2f6beac..4e364aaca33 100644 --- a/solr/core/src/test/org/apache/solr/cloud/autoscaling/ComputePlanActionTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/autoscaling/ComputePlanActionTest.java @@ -397,6 +397,7 @@ public class ComputePlanActionTest extends SolrCloudTestCase { } @Test + @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") public void testSelectedCollections() throws Exception { AssertingTriggerAction.expectedNode = null; diff --git a/solr/core/src/test/org/apache/solr/cloud/autoscaling/TriggerIntegrationTest.java b/solr/core/src/test/org/apache/solr/cloud/autoscaling/TriggerIntegrationTest.java index ad976801886..f0a90e26bae 100644 --- a/solr/core/src/test/org/apache/solr/cloud/autoscaling/TriggerIntegrationTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/autoscaling/TriggerIntegrationTest.java @@ -677,6 +677,7 @@ public class TriggerIntegrationTest extends SolrCloudTestCase { public static long eventQueueActionWait = 5000; @Test + @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") public void testEventQueue() throws Exception { waitForSeconds = 1; CloudSolrClient solrClient = cluster.getSolrClient(); @@ -1402,8 +1403,6 @@ public class TriggerIntegrationTest extends SolrCloudTestCase { } @Test - //Commented out 24-Jan-2018 - //@AwaitsFix(bugUrl = "https://issues.apache.org/jira/browse/SOLR-11714") public void testSearchRate() throws Exception { // start a few more jetty-s for (int i = 0; i < 3; i++) { diff --git a/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/TestGenericDistributedQueue.java b/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/TestGenericDistributedQueue.java index cba700bc95f..4e554df9f82 100644 --- a/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/TestGenericDistributedQueue.java +++ b/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/TestGenericDistributedQueue.java @@ -16,12 +16,14 @@ */ package org.apache.solr.cloud.autoscaling.sim; +import org.apache.lucene.util.LuceneTestCase; import org.apache.solr.client.solrj.cloud.DistributedQueue; import org.apache.solr.client.solrj.cloud.autoscaling.DistribStateManager; /** * */ +@LuceneTestCase.BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") public class TestGenericDistributedQueue extends TestSimDistributedQueue { DistribStateManager stateManager = new SimDistribStateManager(); diff --git a/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/TestLargeCluster.java b/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/TestLargeCluster.java index 9c9d3bb9273..cee0ea154ec 100644 --- a/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/TestLargeCluster.java +++ b/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/TestLargeCluster.java @@ -493,7 +493,8 @@ public class TestLargeCluster extends SimSolrCloudTestCase { } @Test - //@AwaitsFix(bugUrl = "https://issues.apache.org/jira/browse/SOLR-11714") + // JIRA closed 24-Feb-2018. Still apparently a problem. + @BadApple(bugUrl = "https://issues.apache.org/jira/browse/SOLR-11714") public void testSearchRate() throws Exception { SolrClient solrClient = cluster.simGetSolrClient(); String collectionName = "testSearchRate"; diff --git a/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/TestTriggerIntegration.java b/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/TestTriggerIntegration.java index 82f7e5f7b5c..3dfcc1600da 100644 --- a/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/TestTriggerIntegration.java +++ b/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/TestTriggerIntegration.java @@ -896,6 +896,7 @@ public class TestTriggerIntegration extends SimSolrCloudTestCase { } @Test + @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") public void testListeners() throws Exception { SolrClient solrClient = cluster.simGetSolrClient(); String setTriggerCommand = "{" + @@ -1040,6 +1041,7 @@ public class TestTriggerIntegration extends SimSolrCloudTestCase { } @Test + @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") public void testCooldown() throws Exception { SolrClient solrClient = cluster.simGetSolrClient(); failDummyAction = false; @@ -1129,6 +1131,7 @@ public class TestTriggerIntegration extends SimSolrCloudTestCase { } @Test + @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") public void testSearchRate() throws Exception { SolrClient solrClient = cluster.simGetSolrClient(); String COLL1 = "collection1"; diff --git a/solr/core/src/test/org/apache/solr/cloud/cdcr/CdcrBootstrapTest.java b/solr/core/src/test/org/apache/solr/cloud/cdcr/CdcrBootstrapTest.java index 2cabb502daf..cae98554908 100644 --- a/solr/core/src/test/org/apache/solr/cloud/cdcr/CdcrBootstrapTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/cdcr/CdcrBootstrapTest.java @@ -235,6 +235,8 @@ public class CdcrBootstrapTest extends SolrTestCaseJ4 { } } + @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") + @Test public void testBootstrapWithContinousIndexingOnSourceCluster() throws Exception { // start the target first so that we know its zkhost MiniSolrCloudCluster target = new MiniSolrCloudCluster(1, createTempDir("cdcr-target"), buildJettyConfig("/solr")); diff --git a/solr/core/src/test/org/apache/solr/cloud/cdcr/CdcrReplicationDistributedZkTest.java b/solr/core/src/test/org/apache/solr/cloud/cdcr/CdcrReplicationDistributedZkTest.java index 206a08f807f..a1e26044f47 100644 --- a/solr/core/src/test/org/apache/solr/cloud/cdcr/CdcrReplicationDistributedZkTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/cdcr/CdcrReplicationDistributedZkTest.java @@ -32,7 +32,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @Nightly -@BadApple(bugUrl = "https://issues.apache.org/jira/browse/SOLR-10107") +@BadApple(bugUrl = "https://issues.apache.org/jira/browse/SOLR-12028, https://issues.apache.org/jira/browse/SOLR-10107") public class CdcrReplicationDistributedZkTest extends BaseCdcrDistributedZkTest { private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); diff --git a/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsChaosMonkeyNothingIsSafeTest.java b/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsChaosMonkeyNothingIsSafeTest.java index ed512aba974..b3b11406898 100644 --- a/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsChaosMonkeyNothingIsSafeTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsChaosMonkeyNothingIsSafeTest.java @@ -35,7 +35,7 @@ import org.junit.BeforeClass; BadHdfsThreadsFilter.class // hdfs currently leaks thread(s) }) @SuppressObjectReleaseTracker(bugUrl="Testing purposes") -@BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-10191") +@BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028, https://issues.apache.org/jira/browse/SOLR-10191") public class HdfsChaosMonkeyNothingIsSafeTest extends ChaosMonkeyNothingIsSafeTest { private static MiniDFSCluster dfsCluster; diff --git a/solr/core/src/test/org/apache/solr/core/TestJmxIntegration.java b/solr/core/src/test/org/apache/solr/core/TestJmxIntegration.java index 044b3003c0d..0f2c21a9a96 100644 --- a/solr/core/src/test/org/apache/solr/core/TestJmxIntegration.java +++ b/solr/core/src/test/org/apache/solr/core/TestJmxIntegration.java @@ -159,7 +159,7 @@ public class TestJmxIntegration extends SolrTestCaseJ4 { numDocs > oldNumDocs); } - @Test @AwaitsFix(bugUrl="https://issues.apache.org/jira/browse/SOLR-2715") // timing problem? + @Test @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-2715") // timing problem? public void testJmxOnCoreReload() throws Exception { String coreName = h.getCore().getName(); diff --git a/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java b/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java index 62c0aa2d209..3a9adc487ff 100644 --- a/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java +++ b/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java @@ -494,6 +494,7 @@ public class TestReplicationHandler extends SolrTestCaseJ4 { } @Test + @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") public void doTestIndexAndConfigReplication() throws Exception { clearIndexWithReplication(); @@ -623,7 +624,9 @@ public class TestReplicationHandler extends SolrTestCaseJ4 { * the index hasn't changed. See SOLR-9036 */ @Test - @AwaitsFix(bugUrl = "https://issues.apache.org/jira/browse/SOLR-9036") + //Commented out 24-Feb 2018. JIRA marked as fixed. + // Still fails 26-Feb on master. + @BadApple(bugUrl = "https://issues.apache.org/jira/browse/SOLR-9036") public void doTestIndexFetchOnMasterRestart() throws Exception { useFactory(null); try { diff --git a/solr/core/src/test/org/apache/solr/handler/TestReqParamsAPI.java b/solr/core/src/test/org/apache/solr/handler/TestReqParamsAPI.java index ed592c3ff5e..30e9bd9d166 100644 --- a/solr/core/src/test/org/apache/solr/handler/TestReqParamsAPI.java +++ b/solr/core/src/test/org/apache/solr/handler/TestReqParamsAPI.java @@ -40,7 +40,6 @@ import org.junit.Test; import static java.util.Arrays.asList; import static org.apache.solr.handler.TestSolrConfigHandlerCloud.compareValues; -//@AwaitsFix(bugUrl="https://issues.apache.org/jira/browse/SOLR-10136") public class TestReqParamsAPI extends SolrCloudTestCase { private List restTestHarnesses = new ArrayList<>(); diff --git a/solr/core/src/test/org/apache/solr/handler/admin/AutoscalingHistoryHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/admin/AutoscalingHistoryHandlerTest.java index 028f8d844f0..fc44578f716 100644 --- a/solr/core/src/test/org/apache/solr/handler/admin/AutoscalingHistoryHandlerTest.java +++ b/solr/core/src/test/org/apache/solr/handler/admin/AutoscalingHistoryHandlerTest.java @@ -230,6 +230,7 @@ public class AutoscalingHistoryHandlerTest extends SolrCloudTestCase { } @Test + @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") public void testHistory() throws Exception { waitForState("Timed out wait for collection be active", COLL_NAME, clusterShape(1, 3)); diff --git a/solr/core/src/test/org/apache/solr/rest/TestManagedResourceStorage.java b/solr/core/src/test/org/apache/solr/rest/TestManagedResourceStorage.java index 731475395bb..4b7fac01f63 100644 --- a/solr/core/src/test/org/apache/solr/rest/TestManagedResourceStorage.java +++ b/solr/core/src/test/org/apache/solr/rest/TestManagedResourceStorage.java @@ -23,7 +23,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.lucene.util.LuceneTestCase.AwaitsFix; +import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.LuceneTestCase.Slow; import org.apache.solr.cloud.AbstractZkTestCase; import org.apache.solr.common.cloud.SolrZkClient; @@ -39,7 +39,7 @@ import org.junit.Test; * Depends on ZK for testing ZooKeeper backed storage logic. */ @Slow -@AwaitsFix(bugUrl = "https://issues.apache.org/jira/browse/SOLR-6443") +@LuceneTestCase.BadApple(bugUrl = "https://issues.apache.org/jira/browse/SOLR-6443") public class TestManagedResourceStorage extends AbstractZkTestCase { /** diff --git a/solr/core/src/test/org/apache/solr/store/hdfs/HdfsDirectoryTest.java b/solr/core/src/test/org/apache/solr/store/hdfs/HdfsDirectoryTest.java index 0d5d0a78eb7..db1d252d9c8 100644 --- a/solr/core/src/test/org/apache/solr/store/hdfs/HdfsDirectoryTest.java +++ b/solr/core/src/test/org/apache/solr/store/hdfs/HdfsDirectoryTest.java @@ -140,6 +140,7 @@ public class HdfsDirectoryTest extends SolrTestCaseJ4 { } @Test + @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") public void testEOF() throws IOException { Directory fsDir = new RAMDirectory(); String name = "test.eof"; diff --git a/solr/core/src/test/org/apache/solr/update/processor/AtomicUpdateProcessorFactoryTest.java b/solr/core/src/test/org/apache/solr/update/processor/AtomicUpdateProcessorFactoryTest.java index 28b54a29838..9c17dd1b077 100644 --- a/solr/core/src/test/org/apache/solr/update/processor/AtomicUpdateProcessorFactoryTest.java +++ b/solr/core/src/test/org/apache/solr/update/processor/AtomicUpdateProcessorFactoryTest.java @@ -194,7 +194,7 @@ public class AtomicUpdateProcessorFactoryTest extends SolrTestCaseJ4 { } - @AwaitsFix(bugUrl = "https://issues.apache.org/jira/browse/SOLR-10734") + @BadApple(bugUrl = "https://issues.apache.org/jira/browse/SOLR-10734") public void testMultipleThreads() throws Exception { clearIndex(); String[] strings = new String[5]; diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionTest.java index db1a8a2a101..c44dedcd79b 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionTest.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionTest.java @@ -6576,7 +6576,8 @@ public class StreamExpressionTest extends SolrCloudTestCase { assertEquals(prob.doubleValue(), 0.09184805266259899, 0.0); } - @Test + @Test + @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") public void testDistributions() throws Exception { String cexpr = "let(a=normalDistribution(10, 2), " + "b=sample(a, 250), " +