Erick: thank you for fixing my precommit mistake when you made these changes, sorry about that.
: Date: Thu, 21 Jun 2018 23:03:01 +0000 (UTC) : From: er...@apache.org : Reply-To: dev@lucene.apache.org : To: comm...@lucene.apache.org : Subject: lucene-solr:master: SOLR-12028: BadApple and AwaitsFix annotations : usage : : Repository: lucene-solr : Updated Branches: : refs/heads/master 629081f95 -> 5cd8aa4ff : : : SOLR-12028: BadApple and AwaitsFix annotations usage : : : Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo : Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/5cd8aa4f : Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/5cd8aa4f : Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/5cd8aa4f : : Branch: refs/heads/master : Commit: 5cd8aa4ff90e43b6c1cdc9902aaea432efb1558e : Parents: 629081f : Author: Erick Erickson <er...@apache.org> : Authored: Thu Jun 21 16:02:56 2018 -0700 : Committer: Erick Erickson <er...@apache.org> : Committed: Thu Jun 21 16:02:56 2018 -0700 : : ---------------------------------------------------------------------- : .../src/test/org/apache/solr/cloud/AliasIntegrationTest.java | 3 --- : .../src/test/org/apache/solr/cloud/BasicDistributedZkTest.java | 2 ++ : .../solr/cloud/ChaosMonkeySafeLeaderWithPullReplicasTest.java | 2 +- : .../src/test/org/apache/solr/cloud/CreateRoutedAliasTest.java | 4 ---- : solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.java | 2 ++ : .../test/org/apache/solr/cloud/LegacyCloudClusterPropTest.java | 2 +- : .../core/src/test/org/apache/solr/cloud/MoveReplicaHDFSTest.java | 2 +- : .../src/test/org/apache/solr/cloud/ReplaceNodeNoTargetTest.java | 2 +- : solr/core/src/test/org/apache/solr/cloud/RollingRestartTest.java | 2 ++ : .../src/test/org/apache/solr/cloud/TestCloudJSONFacetSKG.java | 1 - : solr/core/src/test/org/apache/solr/cloud/TestCloudRecovery.java | 1 - : solr/core/src/test/org/apache/solr/cloud/TestPullReplica.java | 2 +- : .../test/org/apache/solr/cloud/TestSolrCloudWithKerberosAlt.java | 2 +- : .../org/apache/solr/cloud/autoscaling/ComputePlanActionTest.java | 2 +- : .../org/apache/solr/cloud/autoscaling/ScheduledTriggerTest.java | 2 +- : .../org/apache/solr/cloud/autoscaling/SearchRateTriggerTest.java | 2 ++ : .../solr/cloud/autoscaling/sim/TestGenericDistributedQueue.java | 2 +- : .../org/apache/solr/cloud/autoscaling/sim/TestLargeCluster.java | 4 +++- : .../solr/cloud/autoscaling/sim/TestTriggerIntegration.java | 3 +++ : .../core/src/test/org/apache/solr/cloud/hdfs/StressHdfsTest.java | 2 +- : .../apache/solr/handler/admin/AutoscalingHistoryHandlerTest.java | 1 - : .../src/test/org/apache/solr/update/MaxSizeAutoCommitTest.java | 2 +- : 22 files changed, 25 insertions(+), 22 deletions(-) : ---------------------------------------------------------------------- : : : http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5cd8aa4f/solr/core/src/test/org/apache/solr/cloud/AliasIntegrationTest.java : ---------------------------------------------------------------------- : diff --git a/solr/core/src/test/org/apache/solr/cloud/AliasIntegrationTest.java b/solr/core/src/test/org/apache/solr/cloud/AliasIntegrationTest.java : index 9bafe4a..1af1adf 100644 : --- a/solr/core/src/test/org/apache/solr/cloud/AliasIntegrationTest.java : +++ b/solr/core/src/test/org/apache/solr/cloud/AliasIntegrationTest.java : @@ -87,7 +87,6 @@ public class AliasIntegrationTest extends SolrCloudTestCase { : } : : @Test : - //@BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028";) : public void testProperties() throws Exception { : CollectionAdminRequest.createCollection("collection1meta", "conf", 2, 1).process(cluster.getSolrClient()); : CollectionAdminRequest.createCollection("collection2meta", "conf", 1, 1).process(cluster.getSolrClient()); : @@ -225,7 +224,6 @@ public class AliasIntegrationTest extends SolrCloudTestCase { : } : : @Test : - //@BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028";) // 09-Apr-2018 : public void testModifyPropertiesV1() throws Exception { : // note we don't use TZ in this test, thus it's UTC : final String aliasName = getTestName(); : @@ -241,7 +239,6 @@ public class AliasIntegrationTest extends SolrCloudTestCase { : } : : @Test : - //@BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028";) : public void testModifyPropertiesCAR() throws Exception { : // note we don't use TZ in this test, thus it's UTC : final String aliasName = getTestName(); : : http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5cd8aa4f/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java : ---------------------------------------------------------------------- : 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 867066f..b6de031 100644 : --- a/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java : +++ b/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java : @@ -37,6 +37,7 @@ 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; : @@ -86,6 +87,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 : public class BasicDistributedZkTest extends AbstractFullDistribZkTestBase { : : private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); : : http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5cd8aa4f/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderWithPullReplicasTest.java : ---------------------------------------------------------------------- : diff --git a/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderWithPullReplicasTest.java b/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderWithPullReplicasTest.java : index 5304fc2..662a5d2 100644 : --- a/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderWithPullReplicasTest.java : +++ b/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderWithPullReplicasTest.java : @@ -112,7 +112,7 @@ public class ChaosMonkeySafeLeaderWithPullReplicasTest extends AbstractFullDistr : } : : @Test : - @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028";) : + //2018-06-18 (commented) @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028";) : public void test() throws Exception { : DocCollection docCollection = cloudClient.getZkStateReader().getClusterState().getCollection(DEFAULT_COLLECTION); : assertEquals(this.sliceCount, docCollection.getSlices().size()); : : http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5cd8aa4f/solr/core/src/test/org/apache/solr/cloud/CreateRoutedAliasTest.java : ---------------------------------------------------------------------- : diff --git a/solr/core/src/test/org/apache/solr/cloud/CreateRoutedAliasTest.java b/solr/core/src/test/org/apache/solr/cloud/CreateRoutedAliasTest.java : index dacd1b2..76bde1f 100644 : --- a/solr/core/src/test/org/apache/solr/cloud/CreateRoutedAliasTest.java : +++ b/solr/core/src/test/org/apache/solr/cloud/CreateRoutedAliasTest.java : @@ -86,7 +86,6 @@ public class CreateRoutedAliasTest extends SolrCloudTestCase { : // This is a fairly complete test where we set many options and see that it both affected the created : // collection and that the alias metadata was saved accordingly : @Test : - //@BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028";) // 09-Apr-2018 : public void testV2() throws Exception { : // note we don't use TZ in this test, thus it's UTC : final String aliasName = getTestName(); : @@ -168,7 +167,6 @@ public class CreateRoutedAliasTest extends SolrCloudTestCase { : } : : @Test : - //@BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028";) // 09-Apr-2018 : public void testV1() throws Exception { : final String aliasName = getTestName(); : final String baseUrl = cluster.getRandomJetty(random()).getBaseUrl().toString(); : @@ -212,7 +210,6 @@ public class CreateRoutedAliasTest extends SolrCloudTestCase { : : // TZ should not affect the first collection name if absolute date given for start : @Test : - //@BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028";) // 09-Apr-2018 : public void testTimezoneAbsoluteDate() throws Exception { : final String aliasName = getTestName(); : try (SolrClient client = getCloudSolrClient(cluster)) { : @@ -231,7 +228,6 @@ public class CreateRoutedAliasTest extends SolrCloudTestCase { : } : : @Test : - //@BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028";) // 09-Apr-2018 : public void testCollectionNamesMustBeAbsent() throws Exception { : CollectionAdminRequest.createCollection("collection1meta", "_default", 2, 1).process(cluster.getSolrClient()); : CollectionAdminRequest.createCollection("collection2meta", "_default", 1, 1).process(cluster.getSolrClient()); : : http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5cd8aa4f/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.java : ---------------------------------------------------------------------- : 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 60d7eb7..5db2de9 100644 : --- a/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.java : +++ b/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.java : @@ -32,6 +32,7 @@ import java.util.Properties; : import java.util.Set; : import java.util.concurrent.TimeUnit; : : +import org.apache.lucene.util.LuceneTestCase; : import org.apache.lucene.util.LuceneTestCase.Slow; : import org.apache.solr.JSONTestUtil; : import org.apache.solr.SolrTestCaseJ4.SuppressSSL; : @@ -75,6 +76,7 @@ import static org.apache.solr.common.cloud.Replica.State.RECOVERING; : : @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 : public class HttpPartitionTest extends AbstractFullDistribZkTestBase { : : private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); : : http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5cd8aa4f/solr/core/src/test/org/apache/solr/cloud/LegacyCloudClusterPropTest.java : ---------------------------------------------------------------------- : diff --git a/solr/core/src/test/org/apache/solr/cloud/LegacyCloudClusterPropTest.java b/solr/core/src/test/org/apache/solr/cloud/LegacyCloudClusterPropTest.java : index e7451d6..919c087 100644 : --- a/solr/core/src/test/org/apache/solr/cloud/LegacyCloudClusterPropTest.java : +++ b/solr/core/src/test/org/apache/solr/cloud/LegacyCloudClusterPropTest.java : @@ -65,7 +65,7 @@ public class LegacyCloudClusterPropTest extends SolrCloudTestCase { : }; : : @Test : - @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028";) : + //2018-06-18 (commented) @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028";) : public void testCreateCollectionSwitchLegacyCloud() throws Exception { : createAndTest("legacyTrue", true); : createAndTest("legacyFalse", false); : : http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5cd8aa4f/solr/core/src/test/org/apache/solr/cloud/MoveReplicaHDFSTest.java : ---------------------------------------------------------------------- : 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 a0fef74..64429fb 100644 : --- a/solr/core/src/test/org/apache/solr/cloud/MoveReplicaHDFSTest.java : +++ b/solr/core/src/test/org/apache/solr/cloud/MoveReplicaHDFSTest.java : @@ -65,7 +65,7 @@ public class MoveReplicaHDFSTest extends MoveReplicaTest { : } : : @Test : - @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028";) // 21-May-2018 : + //2018-06-18 (commented) @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028";) // 21-May-2018 : public void testNormalFailedMove() throws Exception { : inPlaceMove = false; : testFailedMove(); : : http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5cd8aa4f/solr/core/src/test/org/apache/solr/cloud/ReplaceNodeNoTargetTest.java : ---------------------------------------------------------------------- : 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 ff8b9c4..16fb146 100644 : --- a/solr/core/src/test/org/apache/solr/cloud/ReplaceNodeNoTargetTest.java : +++ b/solr/core/src/test/org/apache/solr/cloud/ReplaceNodeNoTargetTest.java : @@ -55,7 +55,7 @@ public class ReplaceNodeNoTargetTest extends SolrCloudTestCase { : : : @Test : - @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028";) : + @LuceneTestCase.AwaitsFix(bugUrl = "https://issues.apache.org/jira/browse/SOLR-11067";) : public void test() throws Exception { : cluster.waitForAllNodes(5000); : String coll = "replacenodetest_coll_notarget"; : : http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5cd8aa4f/solr/core/src/test/org/apache/solr/cloud/RollingRestartTest.java : ---------------------------------------------------------------------- : diff --git a/solr/core/src/test/org/apache/solr/cloud/RollingRestartTest.java b/solr/core/src/test/org/apache/solr/cloud/RollingRestartTest.java : index addf732..511f221 100644 : --- a/solr/core/src/test/org/apache/solr/cloud/RollingRestartTest.java : +++ b/solr/core/src/test/org/apache/solr/cloud/RollingRestartTest.java : @@ -22,6 +22,7 @@ import java.util.List; : import java.util.concurrent.TimeUnit; : : import org.apache.commons.collections.CollectionUtils; : +import org.apache.lucene.util.LuceneTestCase; : import org.apache.solr.client.solrj.request.CollectionAdminRequest; : import org.apache.solr.common.cloud.SolrZkClient; : import org.apache.zookeeper.KeeperException; : @@ -46,6 +47,7 @@ public class RollingRestartTest extends AbstractFullDistribZkTestBase { : } : : @Test : + @LuceneTestCase.BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028";) // 2018-06-18 : public void test() throws Exception { : waitForRecoveriesToFinish(false); : : : http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5cd8aa4f/solr/core/src/test/org/apache/solr/cloud/TestCloudJSONFacetSKG.java : ---------------------------------------------------------------------- : diff --git a/solr/core/src/test/org/apache/solr/cloud/TestCloudJSONFacetSKG.java b/solr/core/src/test/org/apache/solr/cloud/TestCloudJSONFacetSKG.java : index 9a8c219..8b4bc77 100644 : --- a/solr/core/src/test/org/apache/solr/cloud/TestCloudJSONFacetSKG.java : +++ b/solr/core/src/test/org/apache/solr/cloud/TestCloudJSONFacetSKG.java : @@ -21,7 +21,6 @@ import java.lang.invoke.MethodHandles; : import java.nio.file.Path; : import java.nio.file.Paths; : import java.util.ArrayList; : -import java.util.Collections; : import java.util.LinkedHashMap; : import java.util.LinkedHashSet; : import java.util.List; : : http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5cd8aa4f/solr/core/src/test/org/apache/solr/cloud/TestCloudRecovery.java : ---------------------------------------------------------------------- : diff --git a/solr/core/src/test/org/apache/solr/cloud/TestCloudRecovery.java b/solr/core/src/test/org/apache/solr/cloud/TestCloudRecovery.java : index 283be53..6b038af 100644 : --- a/solr/core/src/test/org/apache/solr/cloud/TestCloudRecovery.java : +++ b/solr/core/src/test/org/apache/solr/cloud/TestCloudRecovery.java : @@ -87,7 +87,6 @@ public class TestCloudRecovery extends SolrCloudTestCase { : } : : @Test : - // Removed BadApple on 18-May-2018 : public void leaderRecoverFromLogOnStartupTest() throws Exception { : AtomicInteger countReplayLog = new AtomicInteger(0); : DirectUpdateHandler2.commitOnClose = false; : : http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5cd8aa4f/solr/core/src/test/org/apache/solr/cloud/TestPullReplica.java : ---------------------------------------------------------------------- : 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 6e8ed4e..767fb1b 100644 : --- a/solr/core/src/test/org/apache/solr/cloud/TestPullReplica.java : +++ b/solr/core/src/test/org/apache/solr/cloud/TestPullReplica.java : @@ -304,7 +304,7 @@ public class TestPullReplica extends SolrCloudTestCase { : } : : @Test : - @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028";) // 21-May-2018 : + //2018-06-18 (commented) @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028";) // 21-May-2018 : public void testKillLeader() throws Exception { : doTestNoLeader(false); : } : : http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5cd8aa4f/solr/core/src/test/org/apache/solr/cloud/TestSolrCloudWithKerberosAlt.java : ---------------------------------------------------------------------- : diff --git a/solr/core/src/test/org/apache/solr/cloud/TestSolrCloudWithKerberosAlt.java b/solr/core/src/test/org/apache/solr/cloud/TestSolrCloudWithKerberosAlt.java : index 8dda352..5c7bd50 100644 : --- a/solr/core/src/test/org/apache/solr/cloud/TestSolrCloudWithKerberosAlt.java : +++ b/solr/core/src/test/org/apache/solr/cloud/TestSolrCloudWithKerberosAlt.java : @@ -120,7 +120,7 @@ public class TestSolrCloudWithKerberosAlt extends SolrCloudTestCase { : } : : @Test : - @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028";) // 21-May-2018 : + //2018-06-18 (commented) @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028";) // 21-May-2018 : public void testBasics() throws Exception { : testCollectionCreateSearchDelete(); : // sometimes run a second test e.g. to test collection create-delete-create scenario : : http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5cd8aa4f/solr/core/src/test/org/apache/solr/cloud/autoscaling/ComputePlanActionTest.java : ---------------------------------------------------------------------- : 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 e6261e1..cf00ece 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 : @@ -415,7 +415,7 @@ public class ComputePlanActionTest extends SolrCloudTestCase { : } : : @Test : - @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028";) // 09-Apr-2018 : + //2018-06-18 (commented) @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028";) // 09-Apr-2018 : public void testSelectedCollections() throws Exception { : log.info("Found number of jetties: {}", cluster.getJettySolrRunners().size()); : AssertingTriggerAction.expectedNode = null; : : http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5cd8aa4f/solr/core/src/test/org/apache/solr/cloud/autoscaling/ScheduledTriggerTest.java : ---------------------------------------------------------------------- : diff --git a/solr/core/src/test/org/apache/solr/cloud/autoscaling/ScheduledTriggerTest.java b/solr/core/src/test/org/apache/solr/cloud/autoscaling/ScheduledTriggerTest.java : index bf5a390..0a22684 100644 : --- a/solr/core/src/test/org/apache/solr/cloud/autoscaling/ScheduledTriggerTest.java : +++ b/solr/core/src/test/org/apache/solr/cloud/autoscaling/ScheduledTriggerTest.java : @@ -56,7 +56,7 @@ public class ScheduledTriggerTest extends SolrCloudTestCase { : } : : @Test : - @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028";) // 09-Apr-2018 : +//2018-06-18 (commented) @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028";) // 09-Apr-2018 : public void testTrigger() throws Exception { : CoreContainer container = cluster.getJettySolrRunners().get(0).getCoreContainer(); : : : http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5cd8aa4f/solr/core/src/test/org/apache/solr/cloud/autoscaling/SearchRateTriggerTest.java : ---------------------------------------------------------------------- : diff --git a/solr/core/src/test/org/apache/solr/cloud/autoscaling/SearchRateTriggerTest.java b/solr/core/src/test/org/apache/solr/cloud/autoscaling/SearchRateTriggerTest.java : index 47abe3e..60b973f 100644 : --- a/solr/core/src/test/org/apache/solr/cloud/autoscaling/SearchRateTriggerTest.java : +++ b/solr/core/src/test/org/apache/solr/cloud/autoscaling/SearchRateTriggerTest.java : @@ -28,6 +28,7 @@ import java.util.concurrent.TimeUnit; : : import com.codahale.metrics.MetricRegistry; : import com.google.common.util.concurrent.AtomicDouble; : +import org.apache.lucene.util.LuceneTestCase; : import org.apache.solr.client.solrj.cloud.NodeStateProvider; : import org.apache.solr.client.solrj.cloud.autoscaling.ReplicaInfo; : import org.apache.solr.client.solrj.cloud.SolrCloudManager; : @@ -84,6 +85,7 @@ public class SearchRateTriggerTest extends SolrCloudTestCase { : } : : @Test : + @LuceneTestCase.BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028";) // 2018-06-18 : public void testTrigger() throws Exception { : JettySolrRunner targetNode = cluster.getJettySolrRunner(0); : SolrZkClient zkClient = cluster.getSolrClient().getZkStateReader().getZkClient(); : : http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5cd8aa4f/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/TestGenericDistributedQueue.java : ---------------------------------------------------------------------- : 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 9871e23..15fb4d5 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 : @@ -23,7 +23,7 @@ import org.apache.solr.client.solrj.cloud.DistribStateManager; : /** : * : */ : -@LuceneTestCase.BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028";) : +@LuceneTestCase.BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028";) // 2018-02-26 : public class TestGenericDistributedQueue extends TestSimDistributedQueue { : DistribStateManager stateManager = new SimDistribStateManager(); : : : http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5cd8aa4f/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/TestLargeCluster.java : ---------------------------------------------------------------------- : 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 8cb589b..8dd1722 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 : @@ -155,6 +155,7 @@ public class TestLargeCluster extends SimSolrCloudTestCase { : } : : @Test : + @LuceneTestCase.BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028";) // 2018-06-18 : public void testBasic() throws Exception { : SolrClient solrClient = cluster.simGetSolrClient(); : String setTriggerCommand = "{" + : @@ -371,6 +372,7 @@ public class TestLargeCluster extends SimSolrCloudTestCase { : } : : @Test : + @LuceneTestCase.BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028";) // 2018-06-18 : public void testNodeLost() throws Exception { : doTestNodeLost(waitForSeconds, 5000, 0); : } : @@ -584,7 +586,7 @@ public class TestLargeCluster extends SimSolrCloudTestCase { : } : : @Test : - //@BadApple(bugUrl = "https://issues.apache.org/jira/browse/SOLR-11714";) : + @LuceneTestCase.BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028";) // 2018-06-18 : public void testSearchRate() throws Exception { : SolrClient solrClient = cluster.simGetSolrClient(); : String collectionName = "testSearchRate"; : : http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5cd8aa4f/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/TestTriggerIntegration.java : ---------------------------------------------------------------------- : 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 37f1596..3fb528f 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 : @@ -32,6 +32,7 @@ import java.util.concurrent.atomic.AtomicLong; : import java.util.concurrent.locks.ReentrantLock; : : import com.google.common.util.concurrent.AtomicDouble; : +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.AutoScalingConfig; : @@ -140,6 +141,7 @@ public class TestTriggerIntegration extends SimSolrCloudTestCase { : } : : @Test : + @LuceneTestCase.BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028";) // 2018-06-18 : public void testTriggerThrottling() throws Exception { : // for this test we want to create two triggers so we must assert that the actions were created twice : actionInitCalled = new CountDownLatch(2); : @@ -387,6 +389,7 @@ public class TestTriggerIntegration extends SimSolrCloudTestCase { : } : : @Test : + @LuceneTestCase.BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028";) // 2018-06-18 : public void testNodeAddedTrigger() throws Exception { : SolrClient solrClient = cluster.simGetSolrClient(); : String setTriggerCommand = "{" + : : http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5cd8aa4f/solr/core/src/test/org/apache/solr/cloud/hdfs/StressHdfsTest.java : ---------------------------------------------------------------------- : diff --git a/solr/core/src/test/org/apache/solr/cloud/hdfs/StressHdfsTest.java b/solr/core/src/test/org/apache/solr/cloud/hdfs/StressHdfsTest.java : index 10cbe65..bbd83a6 100644 : --- a/solr/core/src/test/org/apache/solr/cloud/hdfs/StressHdfsTest.java : +++ b/solr/core/src/test/org/apache/solr/cloud/hdfs/StressHdfsTest.java : @@ -97,7 +97,7 @@ public class StressHdfsTest extends BasicDistributedZkTest { : } : : @Test : - @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028";) // 21-May-2018 : + //2018-06-18 (commented) @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028";) // 21-May-2018 : public void test() throws Exception { : randomlyEnableAutoSoftCommit(); : : : http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5cd8aa4f/solr/core/src/test/org/apache/solr/handler/admin/AutoscalingHistoryHandlerTest.java : ---------------------------------------------------------------------- : 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 589e2b5..88195c3 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 : @@ -260,7 +260,6 @@ public class AutoscalingHistoryHandlerTest extends SolrCloudTestCase { : } : : @Test : - //@BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028";) // 09-Apr-2018 : public void testHistory() throws Exception { : waitForState("Timed out wait for collection be active", COLL_NAME, : clusterShape(1, 3)); : : http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5cd8aa4f/solr/core/src/test/org/apache/solr/update/MaxSizeAutoCommitTest.java : ---------------------------------------------------------------------- : diff --git a/solr/core/src/test/org/apache/solr/update/MaxSizeAutoCommitTest.java b/solr/core/src/test/org/apache/solr/update/MaxSizeAutoCommitTest.java : index 2764f69..14419e3 100644 : --- a/solr/core/src/test/org/apache/solr/update/MaxSizeAutoCommitTest.java : +++ b/solr/core/src/test/org/apache/solr/update/MaxSizeAutoCommitTest.java : @@ -44,7 +44,7 @@ import org.junit.Assert; : import org.junit.Before; : import org.junit.Test; : : - : +@LuceneTestCase.BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028";) // 2018-06-18 : public class MaxSizeAutoCommitTest extends SolrTestCaseJ4 { : : // Given an ID, returns an XML string for an "add document" request : : -Hoss http://www.lucidworks.com/ --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@lucene.apache.org For additional commands, e-mail: dev-h...@lucene.apache.org
