From commits-return-106300-archive-asf-public=cust-asf.ponee.io@lucene.apache.org Wed Jan 30 04:30:25 2019 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 3718518076D for ; Wed, 30 Jan 2019 05:30:25 +0100 (CET) Received: (qmail 27903 invoked by uid 500); 30 Jan 2019 04:30:24 -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 27606 invoked by uid 99); 30 Jan 2019 04:30:23 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 30 Jan 2019 04:30:23 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id A278D8571E; Wed, 30 Jan 2019 04:30:22 +0000 (UTC) Date: Wed, 30 Jan 2019 04:30:24 +0000 To: "commits@lucene.apache.org" Subject: [lucene-solr] branch master updated: disable TestInjection in TestStressCloudBlindAtomicUpdates MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <154882262242.18351.2563062548551890305@gitbox.apache.org> From: hossman@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: lucene-solr X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 79d0dabed469c4e0e8967b4bb77fae7518930a9a X-Git-Newrev: 0a01b9e12787e56604aab3a0c3792d2aa060ae74 X-Git-Rev: 0a01b9e12787e56604aab3a0c3792d2aa060ae74 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. hossman pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/lucene-solr.git The following commit(s) were added to refs/heads/master by this push: new 0a01b9e disable TestInjection in TestStressCloudBlindAtomicUpdates 0a01b9e is described below commit 0a01b9e12787e56604aab3a0c3792d2aa060ae74 Author: Chris Hostetter AuthorDate: Tue Jan 29 21:23:04 2019 -0700 disable TestInjection in TestStressCloudBlindAtomicUpdates work around for SOLR-13189 --- .../cloud/TestStressCloudBlindAtomicUpdates.java | 25 ++++++++++++++-------- 1 file changed, 16 insertions(+), 9 deletions(-) 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 7c523b1..40b1846 100644 --- a/solr/core/src/test/org/apache/solr/cloud/TestStressCloudBlindAtomicUpdates.java +++ b/solr/core/src/test/org/apache/solr/cloud/TestStressCloudBlindAtomicUpdates.java @@ -172,11 +172,15 @@ public class TestStressCloudBlindAtomicUpdates extends SolrCloudTestCase { @Before private void clearCloudCollection() throws Exception { + TestInjection.reset(); + waitForRecoveriesToFinish(CLOUD_CLIENT); + assertEquals(0, CLOUD_CLIENT.deleteByQuery("*:*").getStatus()); assertEquals(0, CLOUD_CLIENT.optimize().getStatus()); - - TestInjection.reset(); + assertEquals("Collection should be empty!", + 0, CLOUD_CLIENT.query(params("q", "*:*")).getResults().getNumFound()); + final int injectionPercentage = (int)Math.ceil(atLeast(1) / 2); testInjection = usually() ? "false:0" : ("true:" + injectionPercentage); } @@ -185,17 +189,19 @@ public class TestStressCloudBlindAtomicUpdates extends SolrCloudTestCase { * Assigns {@link #testInjection} to various TestInjection variables. Calling this * method multiple times in the same method should always result in the same setting being applied * (even if {@link TestInjection#reset} was called in between. + * + * NOTE: method is currently a No-Op pending SOLR-13189 */ private void startTestInjection() { - log.info("TestInjection: fail replica, update pause, tlog pauses: " + testInjection); - TestInjection.failReplicaRequests = testInjection; - TestInjection.updateLogReplayRandomPause = testInjection; - TestInjection.updateRandomPause = testInjection; + log.info("TODO: TestInjection disabled pending solution to SOLR-13189"); + //log.info("TestInjection: fail replica, update pause, tlog pauses: " + testInjection); + //TestInjection.failReplicaRequests = testInjection; + //TestInjection.updateLogReplayRandomPause = testInjection; + //TestInjection.updateRandomPause = testInjection; } @Test - // commented out on: 24-Dec-2018 @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") public void test_dv() throws Exception { String field = "long_dv"; checkExpectedSchemaField(map("name", field, @@ -206,8 +212,8 @@ public class TestStressCloudBlindAtomicUpdates extends SolrCloudTestCase { checkField(field); } + @Test -// 12-Jun-2018 @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, @@ -229,7 +235,7 @@ public class TestStressCloudBlindAtomicUpdates extends SolrCloudTestCase { checkField(field); } - // commented 4-Sep-2018 @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // added 20-Jul-2018 + public void test_dv_idx() throws Exception { String field = "long_dv_idx"; checkExpectedSchemaField(map("name", field, @@ -473,6 +479,7 @@ public class TestStressCloudBlindAtomicUpdates extends SolrCloudTestCase { public static void waitForRecoveriesToFinish(CloudSolrClient client) throws Exception { assert null != client.getDefaultCollection(); + client.getZkStateReader().forceUpdateCollection(client.getDefaultCollection()); AbstractDistribZkTestBase.waitForRecoveriesToFinish(client.getDefaultCollection(), client.getZkStateReader(), true, true, 330);