From commits-return-100227-archive-asf-public=cust-asf.ponee.io@lucene.apache.org Tue Apr 10 16:11:50 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 73DA91807A5 for ; Tue, 10 Apr 2018 16:11:49 +0200 (CEST) Received: (qmail 35793 invoked by uid 500); 10 Apr 2018 14:11:42 -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 34189 invoked by uid 99); 10 Apr 2018 14:11:41 -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; Tue, 10 Apr 2018 14:11:41 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 3C24BF6BD4; Tue, 10 Apr 2018 14:11:41 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ab@apache.org To: commits@lucene.apache.org Date: Tue, 10 Apr 2018 14:12:13 -0000 Message-Id: In-Reply-To: <6adfb010ab1b4b5a93badf2d2193aee3@git.apache.org> References: <6adfb010ab1b4b5a93badf2d2193aee3@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [34/50] lucene-solr:jira/solr-12181: SOLR-12199: TestReplicationHandler.doTestRepeater(): TEST_PORT interpolation failure: Server refused connection at: http://127.0.0.1:TEST_PORT/solr SOLR-12199: TestReplicationHandler.doTestRepeater(): TEST_PORT interpolation failure: Server refused connection at: http://127.0.0.1:TEST_PORT/solr Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/5c37b07a Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/5c37b07a Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/5c37b07a Branch: refs/heads/jira/solr-12181 Commit: 5c37b07a3d53e64c2f0cebd33eb7024d693d62f5 Parents: abaf378 Author: Steve Rowe Authored: Fri Apr 6 14:50:21 2018 -0400 Committer: Steve Rowe Committed: Fri Apr 6 14:50:21 2018 -0400 ---------------------------------------------------------------------- solr/CHANGES.txt | 3 +++ .../test/org/apache/solr/handler/TestReplicationHandler.java | 8 ++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5c37b07a/solr/CHANGES.txt ---------------------------------------------------------------------- diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index 09c330b..c7270da 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -111,6 +111,9 @@ Bug Fixes * SOLR-11929: UpdateLog metrics are not initialized on core reload. (ab, Steve Rowe) +* SOLR-12199: TestReplicationHandler.doTestRepeater(): TEST_PORT interpolation failure: + Server refused connection at: http://127.0.0.1:TEST_PORT/solr (Mikhail Khludnev, Dawid Weiss, Steve Rowe) + Optimizations ---------------------- http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5c37b07a/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 e8caf99..e4b7fa3 100644 --- a/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java +++ b/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java @@ -294,6 +294,7 @@ public class TestReplicationHandler extends SolrTestCaseJ4 { public void doTestDetails() throws Exception { slaveJetty.stop(); + slave.setTestPort(masterJetty.getLocalPort()); slave.copyConfigFile(CONF_DIR + "solrconfig-slave.xml", "solrconfig.xml"); slaveJetty = createJetty(slave); @@ -706,6 +707,7 @@ public class TestReplicationHandler extends SolrTestCaseJ4 { public void doTestIndexFetchWithMasterUrl() throws Exception { //change solrconfig on slave //this has no entry for pollinginterval + slave.setTestPort(masterJetty.getLocalPort()); slave.copyConfigFile(CONF_DIR + "solrconfig-slave1.xml", "solrconfig.xml"); slaveJetty.stop(); slaveJetty = createJetty(slave); @@ -840,7 +842,8 @@ public class TestReplicationHandler extends SolrTestCaseJ4 { String slaveSchema = SLAVE_SCHEMA_1; try { - + + slave.setTestPort(masterJetty.getLocalPort()); slave.copyConfigFile(CONF_DIR +"solrconfig-slave1.xml", "solrconfig.xml"); slave.copyConfigFile(CONF_DIR +slaveSchema, "schema.xml"); slaveJetty.stop(); @@ -986,6 +989,7 @@ public class TestReplicationHandler extends SolrTestCaseJ4 { @Test public void doTestRepeater() throws Exception { // no polling + slave.setTestPort(masterJetty.getLocalPort()); slave.copyConfigFile(CONF_DIR + "solrconfig-slave1.xml", "solrconfig.xml"); slaveJetty.stop(); slaveJetty = createJetty(slave); @@ -993,7 +997,7 @@ public class TestReplicationHandler extends SolrTestCaseJ4 { slaveClient = createNewSolrClient(slaveJetty.getLocalPort()); try { - repeater = new SolrInstance(createTempDir("solr-instance").toFile(), "repeater", null); + repeater = new SolrInstance(createTempDir("solr-instance").toFile(), "repeater", masterJetty.getLocalPort()); repeater.setUp(); repeater.copyConfigFile(CONF_DIR + "solrconfig-repeater.xml", "solrconfig.xml");