From dcbd5323bbdc2456d1ef0cbe2ee8612b9d58ffe1 Mon Sep 17 00:00:00 2001 From: Erick Erickson Date: Tue, 14 Aug 2018 21:24:59 -0700 Subject: [PATCH] SOLR-12028: BadApple and AwaitsFix annotations usage --- .../apache/solr/cloud/BasicDistributedZkTest.java | 5 ++--- .../test/org/apache/solr/cloud/DeleteShardTest.java | 1 + .../apache/solr/cloud/LIRRollingUpdatesTest.java | 3 +++ .../org/apache/solr/cloud/MoveReplicaHDFSTest.java | 2 +- .../apache/solr/cloud/SaslZkACLProviderTest.java | 2 +- .../solr/cloud/TestPullReplicaErrorHandling.java | 2 +- .../test/org/apache/solr/cloud/TestTlogReplica.java | 1 + .../CollectionsAPIAsyncDistributedZkTest.java | 2 +- .../CollectionsAPIDistributedZkTest.java | 1 + .../cloud/api/collections/CustomCollectionTest.java | 1 + .../api/collections/TestHdfsCloudBackupRestore.java | 9 ++++++++- .../collections/TestLocalFSCloudBackupRestore.java | 13 ++++++++++--- .../sim/TestGenericDistributedQueue.java | 5 +++++ .../autoscaling/sim/TestTriggerIntegration.java | 1 + .../solr/metrics/rrd/SolrRrdBackendFactoryTest.java | 2 +- .../solr/security/BasicAuthIntegrationTest.java | 2 +- 16 files changed, 39 insertions(+), 13 deletions(-) diff --git a/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java b/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java index a46187f4307..ea12c83190c 100644 --- a/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java @@ -37,7 +37,6 @@ import java.util.concurrent.atomic.AtomicInteger; import org.apache.commons.lang.StringUtils; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.LuceneTestCase.Slow; import org.apache.solr.JSONTestUtil; import org.apache.solr.SolrTestCaseJ4.SuppressSSL; @@ -87,7 +86,7 @@ import org.slf4j.LoggerFactory; */ @Slow @SuppressSSL(bugUrl = "https://issues.apache.org/jira/browse/SOLR-5776") -@LuceneTestCase.BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // 2018-06-18 +// DO NOT ENABLE @LuceneTestCase.BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // 2018-06-18 public class BasicDistributedZkTest extends AbstractFullDistribZkTestBase { private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); @@ -150,7 +149,7 @@ public class BasicDistributedZkTest extends AbstractFullDistribZkTestBase { @Test @ShardsFixed(num = 4) - @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // 12-Jun-2018 + //DO NOT ENABLE @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // 12-Jun-2018 public void test() throws Exception { // setLoggingLevel(null); diff --git a/solr/core/src/test/org/apache/solr/cloud/DeleteShardTest.java b/solr/core/src/test/org/apache/solr/cloud/DeleteShardTest.java index e63ed9d301b..293e65b6fff 100644 --- a/solr/core/src/test/org/apache/solr/cloud/DeleteShardTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/DeleteShardTest.java @@ -102,6 +102,7 @@ public class DeleteShardTest extends SolrCloudTestCase { } @Test + @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // added 09-Aug-2018 public void testDirectoryCleanupAfterDeleteShard() throws InterruptedException, IOException, SolrServerException { final String collection = "deleteshard_test"; 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 7867712576e..3ccd32e8df0 100644 --- a/solr/core/src/test/org/apache/solr/cloud/LIRRollingUpdatesTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/LIRRollingUpdatesTest.java @@ -97,6 +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 public void testNewReplicaOldLeader() throws Exception { String collection = "testNewReplicaOldLeader"; @@ -164,6 +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 public void testNewLeaderOldReplica() throws Exception { // in case of new leader & old replica, new leader can still put old replica into LIR @@ -333,6 +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 public void testNewLeaderAndMixedReplicas() throws Exception { testLeaderAndMixedReplicas(false); } 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 6c6b330b50c..7586537f992 100644 --- a/solr/core/src/test/org/apache/solr/cloud/MoveReplicaHDFSTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/MoveReplicaHDFSTest.java @@ -66,7 +66,7 @@ public class MoveReplicaHDFSTest extends MoveReplicaTest { @Test //2018-06-18 (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 20-Jul-2018 + //commented 9-Aug-2018 @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // added 20-Jul-2018 public void testNormalFailedMove() throws Exception { inPlaceMove = false; testFailedMove(); 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 b5b5d17eb07..000d092dd4b 100644 --- a/solr/core/src/test/org/apache/solr/cloud/SaslZkACLProviderTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/SaslZkACLProviderTest.java @@ -114,7 +114,7 @@ public class SaslZkACLProviderTest extends SolrTestCaseJ4 { } @Test - @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // 05-Jul-2018 + //commented 9-Aug-2018 @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // 05-Jul-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/TestPullReplicaErrorHandling.java b/solr/core/src/test/org/apache/solr/cloud/TestPullReplicaErrorHandling.java index 93235f995eb..eb238f6fb44 100644 --- a/solr/core/src/test/org/apache/solr/cloud/TestPullReplicaErrorHandling.java +++ b/solr/core/src/test/org/apache/solr/cloud/TestPullReplicaErrorHandling.java @@ -134,7 +134,7 @@ public class TestPullReplicaErrorHandling extends SolrCloudTestCase { } // @Repeat(iterations=10) -@BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // added 20-Jul-2018 +//commented 9-Aug-2018 @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // added 20-Jul-2018 public void testCantConnectToPullReplica() throws Exception { int numShards = 2; CollectionAdminRequest.createCollection(collectionName, "conf", numShards, 1, 0, 1) 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 6b5d661efbc..d23fc8d7544 100644 --- a/solr/core/src/test/org/apache/solr/cloud/TestTlogReplica.java +++ b/solr/core/src/test/org/apache/solr/cloud/TestTlogReplica.java @@ -148,6 +148,7 @@ public class TestTlogReplica extends SolrCloudTestCase { } @Repeat(iterations=2) // 2 times to make sure cleanup is complete and we can create the same collection + @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // added 09-Aug-2018 public void testCreateDelete() throws Exception { try { switch (random().nextInt(3)) { diff --git a/solr/core/src/test/org/apache/solr/cloud/api/collections/CollectionsAPIAsyncDistributedZkTest.java b/solr/core/src/test/org/apache/solr/cloud/api/collections/CollectionsAPIAsyncDistributedZkTest.java index 07a88081f39..28ee350e4b0 100644 --- a/solr/core/src/test/org/apache/solr/cloud/api/collections/CollectionsAPIAsyncDistributedZkTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/api/collections/CollectionsAPIAsyncDistributedZkTest.java @@ -89,7 +89,7 @@ public class CollectionsAPIAsyncDistributedZkTest extends SolrCloudTestCase { } @Test - @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // 21-May-2018 + //commented 9-Aug-2018 @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // 21-May-2018 public void testAsyncRequests() throws Exception { final String collection = "testAsyncOperations"; diff --git a/solr/core/src/test/org/apache/solr/cloud/api/collections/CollectionsAPIDistributedZkTest.java b/solr/core/src/test/org/apache/solr/cloud/api/collections/CollectionsAPIDistributedZkTest.java index d7bef5e52d6..e1d4344af1f 100644 --- a/solr/core/src/test/org/apache/solr/cloud/api/collections/CollectionsAPIDistributedZkTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/api/collections/CollectionsAPIDistributedZkTest.java @@ -422,6 +422,7 @@ public class CollectionsAPIDistributedZkTest extends SolrCloudTestCase { @Test //28-June-2018 @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // See: https://issues.apache.org/jira/browse/SOLR-12028 Tests cannot remove files on Windows machines occasionally + @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // added 09-Aug-2018 SOLR-12028 public void testCollectionsAPI() throws Exception { // create new collections rapid fire diff --git a/solr/core/src/test/org/apache/solr/cloud/api/collections/CustomCollectionTest.java b/solr/core/src/test/org/apache/solr/cloud/api/collections/CustomCollectionTest.java index 70a1194509f..5a14a235168 100644 --- a/solr/core/src/test/org/apache/solr/cloud/api/collections/CustomCollectionTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/api/collections/CustomCollectionTest.java @@ -149,6 +149,7 @@ public class CustomCollectionTest extends SolrCloudTestCase { } @Test + @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // added 09-Aug-2018 public void testRouteFieldForHashRouter()throws Exception{ String collectionName = "routeFieldColl"; int numShards = 4; 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 ae391ae5ce2..8af397f9a17 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 @@ -45,6 +45,7 @@ import org.apache.solr.core.backup.repository.HdfsBackupRepository; import org.apache.solr.util.BadHdfsThreadsFilter; import org.junit.AfterClass; import org.junit.BeforeClass; +import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -206,5 +207,11 @@ public class TestHdfsCloudBackupRestore extends AbstractCloudBackupRestoreTestCa assertTrue(expected.contains(d)); } } + @Override + @Test + @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/api/collections/TestLocalFSCloudBackupRestore.java b/solr/core/src/test/org/apache/solr/cloud/api/collections/TestLocalFSCloudBackupRestore.java index cb6c0dd953b..34c6e3d8072 100644 --- a/solr/core/src/test/org/apache/solr/cloud/api/collections/TestLocalFSCloudBackupRestore.java +++ b/solr/core/src/test/org/apache/solr/cloud/api/collections/TestLocalFSCloudBackupRestore.java @@ -16,15 +16,15 @@ */ package org.apache.solr.cloud.api.collections; -import org.apache.lucene.util.LuceneTestCase; import org.junit.BeforeClass; +import org.junit.Test; /** * This class implements the tests for local file-system integration for Solr backup/restore capability. * Note that the Solr backup/restore still requires a "shared" file-system. Its just that in this case * such file-system would be exposed via local file-system API. */ -@LuceneTestCase.BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // 2-Aug-2018 +//commented 9-Aug-2018 @LuceneTestCase.BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // 2-Aug-2018 public class TestLocalFSCloudBackupRestore extends AbstractCloudBackupRestoreTestCase { private static String backupLocation; @@ -56,4 +56,11 @@ public class TestLocalFSCloudBackupRestore extends AbstractCloudBackupRestoreTes public String getBackupLocation() { return backupLocation; } -} + + @Override + @Test + @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/sim/TestGenericDistributedQueue.java b/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/TestGenericDistributedQueue.java index 4f25d1003a2..7e19f0039e1 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 @@ -32,4 +32,9 @@ public class TestGenericDistributedQueue extends TestSimDistributedQueue { protected DistributedQueue makeDistributedQueue(String dqZNode) throws Exception { return new GenericDistributedQueue(stateManager, dqZNode); } + + @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // added 09-Aug-2018 + public void testDistributedQueue() throws Exception { + super.testDistributedQueue(); + } } 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 1340bace459..b49a7d507fa 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 @@ -286,6 +286,7 @@ public class TestTriggerIntegration extends SimSolrCloudTestCase { @Test // commented 20-July-2018 @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") + @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // added 09-Aug-2018 public void testNodeLostTriggerRestoreState() throws Exception { // for this test we want to update the trigger so we must assert that the actions were created twice TestTriggerIntegration.actionInitCalled = new CountDownLatch(2); diff --git a/solr/core/src/test/org/apache/solr/metrics/rrd/SolrRrdBackendFactoryTest.java b/solr/core/src/test/org/apache/solr/metrics/rrd/SolrRrdBackendFactoryTest.java index 8f820261d59..8cc660e1160 100644 --- a/solr/core/src/test/org/apache/solr/metrics/rrd/SolrRrdBackendFactoryTest.java +++ b/solr/core/src/test/org/apache/solr/metrics/rrd/SolrRrdBackendFactoryTest.java @@ -79,7 +79,7 @@ public class SolrRrdBackendFactoryTest extends SolrTestCaseJ4 { } @Test - @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // 28-June-2018 + //commented 9-Aug-2018 @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // 28-June-2018 public void testBasic() throws Exception { long startTime = 1000000000; RrdDb db = new RrdDb(createDef(startTime), factory); diff --git a/solr/core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.java b/solr/core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.java index 9a67e2cf0ce..95d243d84d5 100644 --- a/solr/core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.java +++ b/solr/core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.java @@ -83,7 +83,7 @@ public class BasicAuthIntegrationTest extends SolrCloudTestCase { } @Test - @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // 21-May-2018 + //commented 9-Aug-2018 @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // 21-May-2018 public void testBasicAuth() throws Exception { boolean isUseV2Api = random().nextBoolean(); String authcPrefix = "/admin/authentication";