From 9a9c65a6ba3503fe5e505b1b7ae8cc43da3a271f Mon Sep 17 00:00:00 2001 From: Erick Erickson Date: Mon, 2 Jul 2018 12:32:49 -0700 Subject: [PATCH] SOLR-12028: Forgot to check in last Thursday --- .../org/apache/solr/cloud/ChaosMonkeySafeLeaderTest.java | 2 +- .../src/test/org/apache/solr/cloud/DeleteReplicaTest.java | 5 +++-- .../apache/solr/cloud/LeaderFailoverAfterPartitionTest.java | 2 +- .../org/apache/solr/cloud/LeaderVoteWaitTimeoutTest.java | 2 +- solr/core/src/test/org/apache/solr/cloud/RecoveryZkTest.java | 1 + .../src/test/org/apache/solr/cloud/TestCloudPivotFacet.java | 1 + .../test/org/apache/solr/cloud/UnloadDistributedZkTest.java | 2 +- .../api/collections/CollectionsAPIDistributedZkTest.java | 2 +- .../apache/solr/cloud/autoscaling/ComputePlanActionTest.java | 2 +- .../apache/solr/cloud/autoscaling/NodeLostTriggerTest.java | 2 +- .../solr/cloud/autoscaling/sim/TestComputePlanAction.java | 2 ++ .../solr/cloud/autoscaling/sim/TestExecutePlanAction.java | 2 ++ .../apache/solr/cloud/autoscaling/sim/TestLargeCluster.java | 1 + .../test/org/apache/solr/cloud/cdcr/CdcrBootstrapTest.java | 2 +- .../src/test/org/apache/solr/handler/TestSQLHandler.java | 2 +- .../apache/solr/metrics/rrd/SolrRrdBackendFactoryTest.java | 1 + solr/core/src/test/org/apache/solr/search/TestRecovery.java | 4 +++- .../src/test/org/apache/solr/update/TestHdfsUpdateLog.java | 2 +- .../org/apache/solr/update/TestInPlaceUpdatesDistrib.java | 2 +- 19 files changed, 25 insertions(+), 14 deletions(-) diff --git a/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderTest.java b/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderTest.java index 76c1984a0d0..27ed3a63b72 100644 --- a/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderTest.java @@ -81,7 +81,7 @@ public class ChaosMonkeySafeLeaderTest extends AbstractFullDistribZkTestBase { } @Test - @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") + // 29-June-2018 @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") public void test() throws Exception { handle.clear(); 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 4aa2b5515d1..52d5e45c840 100644 --- a/solr/core/src/test/org/apache/solr/cloud/DeleteReplicaTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/DeleteReplicaTest.java @@ -173,6 +173,7 @@ public class DeleteReplicaTest extends SolrCloudTestCase { } @Test + @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // 28-June-2018 public void deleteReplicaFromClusterState() throws Exception { deleteReplicaFromClusterState("true"); deleteReplicaFromClusterState("false"); @@ -221,7 +222,7 @@ public class DeleteReplicaTest extends SolrCloudTestCase { @Test @Slow - @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // 21-May-2018 + //28-June-2018 @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // 21-May-2018 public void raceConditionOnDeleteAndRegisterReplica() throws Exception { raceConditionOnDeleteAndRegisterReplica("true"); raceConditionOnDeleteAndRegisterReplica("false"); @@ -356,7 +357,7 @@ public class DeleteReplicaTest extends SolrCloudTestCase { } @Test - @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // 09-Apr-2018 + //28-June-2018 @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // 09-Apr-2018 public void deleteReplicaOnIndexing() throws Exception { final String collectionName = "deleteReplicaOnIndexing"; CollectionAdminRequest.createCollection(collectionName, "conf", 1, 2) 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 40aea97227a..ba0059766c3 100644 --- a/solr/core/src/test/org/apache/solr/cloud/LeaderFailoverAfterPartitionTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/LeaderFailoverAfterPartitionTest.java @@ -49,7 +49,7 @@ public class LeaderFailoverAfterPartitionTest extends HttpPartitionTest { @Test - @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") + //28-June-2018 @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/LeaderVoteWaitTimeoutTest.java b/solr/core/src/test/org/apache/solr/cloud/LeaderVoteWaitTimeoutTest.java index f2b016b89e4..e937cdded1d 100644 --- a/solr/core/src/test/org/apache/solr/cloud/LeaderVoteWaitTimeoutTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/LeaderVoteWaitTimeoutTest.java @@ -87,7 +87,7 @@ public class LeaderVoteWaitTimeoutTest extends SolrCloudTestCase { } @Test - @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // 21-May-2018 + //28-June-2018 @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // 21-May-2018 public void basicTest() throws Exception { final String collectionName = "basicTest"; CollectionAdminRequest.createCollection(collectionName, 1, 1) diff --git a/solr/core/src/test/org/apache/solr/cloud/RecoveryZkTest.java b/solr/core/src/test/org/apache/solr/cloud/RecoveryZkTest.java index 7e30d5c7347..398002c3f7f 100644 --- a/solr/core/src/test/org/apache/solr/cloud/RecoveryZkTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/RecoveryZkTest.java @@ -59,6 +59,7 @@ public class RecoveryZkTest extends SolrCloudTestCase { } @Test + @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // 28-June-2018 public void test() throws Exception { final String collection = "recoverytest"; diff --git a/solr/core/src/test/org/apache/solr/cloud/TestCloudPivotFacet.java b/solr/core/src/test/org/apache/solr/cloud/TestCloudPivotFacet.java index fa977da9fbb..a02ac2809f9 100644 --- a/solr/core/src/test/org/apache/solr/cloud/TestCloudPivotFacet.java +++ b/solr/core/src/test/org/apache/solr/cloud/TestCloudPivotFacet.java @@ -107,6 +107,7 @@ public class TestCloudPivotFacet extends AbstractFullDistribZkTestBase { } @Test + @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // 28-June-2018 public void test() throws Exception { sanityCheckAssertNumerics(); diff --git a/solr/core/src/test/org/apache/solr/cloud/UnloadDistributedZkTest.java b/solr/core/src/test/org/apache/solr/cloud/UnloadDistributedZkTest.java index 3c3ddf49ef5..e34d4f76249 100644 --- a/solr/core/src/test/org/apache/solr/cloud/UnloadDistributedZkTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/UnloadDistributedZkTest.java @@ -64,7 +64,7 @@ public class UnloadDistributedZkTest extends BasicDistributedZkTest { } @Test - @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // 21-May-2018 + //28-June-2018 @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // 21-May-2018 public void test() throws Exception { testCoreUnloadAndLeaders(); // long 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 290196130e2..d7bef5e52d6 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 @@ -420,7 +420,7 @@ public class CollectionsAPIDistributedZkTest extends SolrCloudTestCase { } @Test - @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") + //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 public void testCollectionsAPI() throws Exception { 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 cf00ece4e22..16cc34e415d 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 @@ -157,7 +157,7 @@ public class ComputePlanActionTest extends SolrCloudTestCase { } @Test - @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // 21-May-2018 + //28-June-2018 @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // 21-May-2018 public void testNodeLost() throws Exception { // let's start a node so that we have at least two JettySolrRunner runner = cluster.startJettySolrRunner(); diff --git a/solr/core/src/test/org/apache/solr/cloud/autoscaling/NodeLostTriggerTest.java b/solr/core/src/test/org/apache/solr/cloud/autoscaling/NodeLostTriggerTest.java index be2b4a7033b..0f9a348d309 100644 --- a/solr/core/src/test/org/apache/solr/cloud/autoscaling/NodeLostTriggerTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/autoscaling/NodeLostTriggerTest.java @@ -224,7 +224,7 @@ public class NodeLostTriggerTest extends SolrCloudTestCase { } @Test - @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // 16-Apr-2018 + //28-June-2018 @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // 16-Apr-2018 public void testListenerAcceptance() throws Exception { CoreContainer container = cluster.getJettySolrRunners().get(0).getCoreContainer(); Map props = createTriggerProps(0); diff --git a/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/TestComputePlanAction.java b/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/TestComputePlanAction.java index 6f47b7f122e..9edf0edf44b 100644 --- a/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/TestComputePlanAction.java +++ b/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/TestComputePlanAction.java @@ -27,6 +27,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; 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.SolrResponse; @@ -253,6 +254,7 @@ public class TestComputePlanAction extends SimSolrCloudTestCase { } @Test + @LuceneTestCase.BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // 28-June-2018 public void testNodeAdded() throws Exception { AssertingTriggerAction.expectedNode = null; SolrClient solrClient = cluster.simGetSolrClient(); diff --git a/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/TestExecutePlanAction.java b/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/TestExecutePlanAction.java index 9117dcd09c0..36d72b83454 100644 --- a/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/TestExecutePlanAction.java +++ b/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/TestExecutePlanAction.java @@ -27,6 +27,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.stream.Collectors; import com.google.common.collect.Lists; +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.cloud.autoscaling.TriggerEventType; @@ -79,6 +80,7 @@ public class TestExecutePlanAction extends SimSolrCloudTestCase { } @Test + @LuceneTestCase.BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // 28-June-2018 public void testExecute() throws Exception { SolrClient solrClient = cluster.simGetSolrClient(); String collectionName = "testExecute"; 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 8dd1722397f..a6b6743a32f 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 @@ -266,6 +266,7 @@ public class TestLargeCluster extends SimSolrCloudTestCase { } @Test + @LuceneTestCase.BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // 28-June-2018 public void testAddNode() throws Exception { SolrClient solrClient = cluster.simGetSolrClient(); String setTriggerCommand = "{" + 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 543bd5cacfc..fc8e5e8b1c4 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 @@ -237,7 +237,7 @@ public class CdcrBootstrapTest extends SolrTestCaseJ4 { } } - @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") + // 29-June-2018 @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 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 3815f6638b3..47b2328ce48 100644 --- a/solr/core/src/test/org/apache/solr/handler/TestSQLHandler.java +++ b/solr/core/src/test/org/apache/solr/handler/TestSQLHandler.java @@ -76,7 +76,7 @@ public class TestSQLHandler extends AbstractFullDistribZkTestBase { } @Test - @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // 21-May-2018 + //28-June-2018 @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // 21-May-2018 public void doTest() throws Exception { waitForRecoveriesToFinish(false); 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 62b1cac35a9..8f820261d59 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,6 +79,7 @@ public class SolrRrdBackendFactoryTest extends SolrTestCaseJ4 { } @Test + @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/search/TestRecovery.java b/solr/core/src/test/org/apache/solr/search/TestRecovery.java index 1b79cee61c1..413cf7ee216 100644 --- a/solr/core/src/test/org/apache/solr/search/TestRecovery.java +++ b/solr/core/src/test/org/apache/solr/search/TestRecovery.java @@ -24,6 +24,7 @@ import com.codahale.metrics.Gauge; import com.codahale.metrics.Meter; import com.codahale.metrics.Metric; import com.codahale.metrics.MetricRegistry; +import org.apache.lucene.util.LuceneTestCase; import org.apache.solr.common.util.TimeSource; import org.apache.solr.metrics.SolrMetricManager; import org.apache.solr.util.TimeOut; @@ -1007,7 +1008,8 @@ public class TestRecovery extends SolrTestCaseJ4 { } - @Test + @Test + @LuceneTestCase.BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // 28-June-2018 public void testExistOldBufferLog() throws Exception { DirectUpdateHandler2.commitOnClose = false; diff --git a/solr/core/src/test/org/apache/solr/update/TestHdfsUpdateLog.java b/solr/core/src/test/org/apache/solr/update/TestHdfsUpdateLog.java index 175bfbc1a20..a1f80ef8f43 100644 --- a/solr/core/src/test/org/apache/solr/update/TestHdfsUpdateLog.java +++ b/solr/core/src/test/org/apache/solr/update/TestHdfsUpdateLog.java @@ -83,7 +83,7 @@ public class TestHdfsUpdateLog extends SolrTestCaseJ4 { } @Test - @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // 21-May-2018 + //28-June-2018 @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // 21-May-2018 public void testFSThreadSafety() throws Exception { final SolrQueryRequest req = req(); diff --git a/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdatesDistrib.java b/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdatesDistrib.java index 058e34493ae..b9be98906e8 100644 --- a/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdatesDistrib.java +++ b/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdatesDistrib.java @@ -119,7 +119,7 @@ public class TestInPlaceUpdatesDistrib extends AbstractFullDistribZkTestBase { @Test @ShardsFixed(num = 3) @SuppressWarnings("unchecked") - @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // 21-May-2018 + //28-June-2018 @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // 21-May-2018 public void test() throws Exception { waitForRecoveriesToFinish(true); mapReplicasToClients();