From commits-return-105514-archive-asf-public=cust-asf.ponee.io@lucene.apache.org Mon Dec 10 05:55:54 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 A55E8180679 for ; Mon, 10 Dec 2018 05:55:53 +0100 (CET) Received: (qmail 73907 invoked by uid 500); 10 Dec 2018 04:55:52 -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 73823 invoked by uid 99); 10 Dec 2018 04:55:52 -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; Mon, 10 Dec 2018 04:55:52 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id ECEDEDFA5A; Mon, 10 Dec 2018 04:55:51 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: markrmiller@apache.org To: commits@lucene.apache.org Date: Mon, 10 Dec 2018 04:55:52 -0000 Message-Id: <062d7eb5d0cb4b25a951f68fd16ceb19@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/3] lucene-solr:master: SOLR-12801: Try to harden TestReplicatinHandler#doTestIndexFetchOnMasterRestart. SOLR-12801: Try to harden TestReplicatinHandler#doTestIndexFetchOnMasterRestart. Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/5405b2f1 Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/5405b2f1 Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/5405b2f1 Branch: refs/heads/master Commit: 5405b2f1c3bfca7762b16fc07179f27543904be6 Parents: f47976a Author: markrmiller Authored: Sun Dec 9 22:18:37 2018 -0600 Committer: markrmiller Committed: Sun Dec 9 22:55:25 2018 -0600 ---------------------------------------------------------------------- .../solr/handler/TestReplicationHandler.java | 27 ++++++++++++++------ 1 file changed, 19 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5405b2f1/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java ---------------------------------------------------------------------- diff --git a/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java b/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java index f1a9a86..f2b0b39 100644 --- a/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java +++ b/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java @@ -647,14 +647,23 @@ public class TestReplicationHandler extends SolrTestCaseJ4 { String cmp = BaseDistributedSearchTestCase.compare(masterQueryResult, slaveQueryResult, 0, null); assertEquals(null, cmp); - int timesReplicated = Integer.parseInt(getSlaveDetails("timesIndexReplicated")); - String timesFailed = getSlaveDetails("timesFailed"); - if (null == timesFailed) { + String timesReplicatedString = getSlaveDetails("timesIndexReplicated"); + String timesFailed; + Integer previousTimesFailed = null; + if (timesReplicatedString == null) { timesFailed = "0"; + } else { + int timesReplicated = Integer.parseInt(timesReplicatedString); + timesFailed = getSlaveDetails("timesFailed"); + if (null == timesFailed) { + timesFailed = "0"; + } + + previousTimesFailed = Integer.parseInt(timesFailed); + // Sometimes replication will fail because master's core is still loading; make sure there was one success + assertEquals(1, timesReplicated - previousTimesFailed); + } - int previousTimesFailed = Integer.parseInt(timesFailed); - // Sometimes replication will fail because master's core is still loading; make sure there was one success - assertEquals(1, timesReplicated - previousTimesFailed); masterJetty.stop(); @@ -672,7 +681,9 @@ public class TestReplicationHandler extends SolrTestCaseJ4 { assertEquals(nDocs, numFound(slaveQueryRsp)); int failed = Integer.parseInt(getSlaveDetails("timesFailed")); - assertTrue(failed > previousTimesFailed); + if (previousTimesFailed != null) { + assertTrue(failed > previousTimesFailed); + } assertEquals(1, Integer.parseInt(getSlaveDetails("timesIndexReplicated")) - failed); } finally { resetFactory(); @@ -684,7 +695,7 @@ public class TestReplicationHandler extends SolrTestCaseJ4 { params.set(CommonParams.QT, "/replication"); params.set("command", "details"); QueryResponse response = slaveClient.query(params); - System.out.println("SHALIN: " + response.getResponse()); + // details/slave/timesIndexReplicated NamedList details = (NamedList) response.getResponse().get("details"); NamedList slave = (NamedList) details.get("slave");