From commits-return-99595-archive-asf-public=cust-asf.ponee.io@lucene.apache.org Sun Mar 18 03:26:22 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 8116B180652 for ; Sun, 18 Mar 2018 03:26:21 +0100 (CET) Received: (qmail 72292 invoked by uid 500); 18 Mar 2018 02:26:20 -0000 Mailing-List: contact commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@lucene.apache.org Delivered-To: mailing list commits@lucene.apache.org Received: (qmail 72282 invoked by uid 99); 18 Mar 2018 02:26:20 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 18 Mar 2018 02:26:20 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 3DA1CDFA44; Sun, 18 Mar 2018 02:26:20 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: erick@apache.org To: commits@lucene.apache.org Message-Id: <163214664af74196b295f5188facdbdc@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: lucene-solr:branch_7x: SOLR-12028: BadApple and AwaitsFix annotations usage Date: Sun, 18 Mar 2018 02:26:20 +0000 (UTC) Repository: lucene-solr Updated Branches: refs/heads/branch_7x dfbf04ce3 -> 741b0685f SOLR-12028: BadApple and AwaitsFix annotations usage (cherry picked from commit c48177b) Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/741b0685 Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/741b0685 Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/741b0685 Branch: refs/heads/branch_7x Commit: 741b0685f0399afb2cf1b64950536f1ff2a46dfb Parents: dfbf04c Author: Erick Erickson Authored: Sat Mar 17 19:25:18 2018 -0700 Committer: Erick Erickson Committed: Sat Mar 17 19:26:00 2018 -0700 ---------------------------------------------------------------------- .../src/test/org/apache/solr/cloud/LeaderVoteWaitTimeoutTest.java | 2 ++ solr/core/src/test/org/apache/solr/cloud/MoveReplicaTest.java | 1 + solr/core/src/test/org/apache/solr/cloud/SSLMigrationTest.java | 1 + .../src/test/org/apache/solr/cloud/TestLeaderElectionZkExpiry.java | 1 + .../solr/cloud/autoscaling/ScheduledMaintenanceTriggerTest.java | 1 + 5 files changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/741b0685/solr/core/src/test/org/apache/solr/cloud/LeaderVoteWaitTimeoutTest.java ---------------------------------------------------------------------- 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 e487fcb..c9eb336 100644 --- a/solr/core/src/test/org/apache/solr/cloud/LeaderVoteWaitTimeoutTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/LeaderVoteWaitTimeoutTest.java @@ -90,6 +90,7 @@ public class LeaderVoteWaitTimeoutTest extends SolrCloudTestCase { } @Test + @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // 17-Mar-2018 public void basicTest() throws Exception { final String collectionName = "basicTest"; CollectionAdminRequest.createCollection(collectionName, 1, 1) @@ -126,6 +127,7 @@ public class LeaderVoteWaitTimeoutTest extends SolrCloudTestCase { } @Test + @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // 17-Mar-2018 public void testMostInSyncReplicasCanWinElection() throws Exception { final String collectionName = "collection1"; CollectionAdminRequest.createCollection(collectionName, 1, 3) http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/741b0685/solr/core/src/test/org/apache/solr/cloud/MoveReplicaTest.java ---------------------------------------------------------------------- diff --git a/solr/core/src/test/org/apache/solr/cloud/MoveReplicaTest.java b/solr/core/src/test/org/apache/solr/cloud/MoveReplicaTest.java index 25fa94e..395b1d8 100644 --- a/solr/core/src/test/org/apache/solr/cloud/MoveReplicaTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/MoveReplicaTest.java @@ -249,6 +249,7 @@ public class MoveReplicaTest extends SolrCloudTestCase { //Commented out 5-Dec-2017 // @AwaitsFix(bugUrl = "https://issues.apache.org/jira/browse/SOLR-11458") @Test + @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // 17-Mar-2018 This JIRA is fixed, but this test still fails public void testFailedMove() throws Exception { String coll = getTestClass().getSimpleName() + "_failed_coll_" + inPlaceMove; int REPLICATION = 2; http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/741b0685/solr/core/src/test/org/apache/solr/cloud/SSLMigrationTest.java ---------------------------------------------------------------------- diff --git a/solr/core/src/test/org/apache/solr/cloud/SSLMigrationTest.java b/solr/core/src/test/org/apache/solr/cloud/SSLMigrationTest.java index 691a99e..f3efd63 100644 --- a/solr/core/src/test/org/apache/solr/cloud/SSLMigrationTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/SSLMigrationTest.java @@ -54,6 +54,7 @@ import static org.apache.solr.common.util.Utils.makeMap; public class SSLMigrationTest extends AbstractFullDistribZkTestBase { @Test + @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // 17-Mar-2018 public void test() throws Exception { //Migrate from HTTP -> HTTPS -> HTTP assertReplicaInformation("http"); http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/741b0685/solr/core/src/test/org/apache/solr/cloud/TestLeaderElectionZkExpiry.java ---------------------------------------------------------------------- diff --git a/solr/core/src/test/org/apache/solr/cloud/TestLeaderElectionZkExpiry.java b/solr/core/src/test/org/apache/solr/cloud/TestLeaderElectionZkExpiry.java index b890777..17cfbe3 100644 --- a/solr/core/src/test/org/apache/solr/cloud/TestLeaderElectionZkExpiry.java +++ b/solr/core/src/test/org/apache/solr/cloud/TestLeaderElectionZkExpiry.java @@ -41,6 +41,7 @@ public class TestLeaderElectionZkExpiry extends SolrTestCaseJ4 { private static final int MIN_NODES = 4; @Test + @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // 17-Mar-2018 public void testLeaderElectionWithZkExpiry() throws Exception { String zkDir = createTempDir("zkData").toFile().getAbsolutePath(); Path ccDir = createTempDir("testLeaderElectionWithZkExpiry-solr"); http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/741b0685/solr/core/src/test/org/apache/solr/cloud/autoscaling/ScheduledMaintenanceTriggerTest.java ---------------------------------------------------------------------- diff --git a/solr/core/src/test/org/apache/solr/cloud/autoscaling/ScheduledMaintenanceTriggerTest.java b/solr/core/src/test/org/apache/solr/cloud/autoscaling/ScheduledMaintenanceTriggerTest.java index 97e4aa9..550ade4 100644 --- a/solr/core/src/test/org/apache/solr/cloud/autoscaling/ScheduledMaintenanceTriggerTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/autoscaling/ScheduledMaintenanceTriggerTest.java @@ -146,6 +146,7 @@ public class ScheduledMaintenanceTriggerTest extends SolrCloudTestCase { } @Test + @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // 17-Mar-2018 public void testInactiveShardCleanup() throws Exception { String collection1 = getClass().getSimpleName() + "_collection1"; CollectionAdminRequest.Create create1 = CollectionAdminRequest.createCollection(collection1,