You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2018/03/14 20:53:17 UTC

lucene-solr:branch_7x: SOLR-12078: Fixed reproducable Failure in TestReplicationHandler.doTestIndexFetchOnMasterRestart that happened due to using stale http connections

Repository: lucene-solr
Updated Branches:
  refs/heads/branch_7x f8bbfcdc7 -> 46f1b7f65


SOLR-12078: Fixed reproducable Failure in TestReplicationHandler.doTestIndexFetchOnMasterRestart that happened due to using stale http connections

(cherry picked from commit cb453ce)


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/46f1b7f6
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/46f1b7f6
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/46f1b7f6

Branch: refs/heads/branch_7x
Commit: 46f1b7f654259e9191dc5282e1d58a12ea9a4025
Parents: f8bbfcd
Author: Shalin Shekhar Mangar <sh...@apache.org>
Authored: Thu Mar 15 02:22:25 2018 +0530
Committer: Shalin Shekhar Mangar <sh...@apache.org>
Committed: Thu Mar 15 02:23:08 2018 +0530

----------------------------------------------------------------------
 solr/CHANGES.txt                                                 | 3 +++
 .../src/test/org/apache/solr/handler/TestReplicationHandler.java | 4 ++++
 2 files changed, 7 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/46f1b7f6/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index a49f6de..15d1e64 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -413,6 +413,9 @@ Other Changes
 * SOLR-12067: Increase autoAddReplicas default 30 second wait time to 120 seconds.
   (Varun Thacker, Mark Miller via shalin)
 
+* SOLR-12078: Fixed reproducable Failure in TestReplicationHandler.doTestIndexFetchOnMasterRestart that happened
+  due to using stale http connections. (Gus Heck, shalin)
+
 ==================  7.2.1 ==================
 
 Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/46f1b7f6/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 842f351..ddc5b60 100644
--- a/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java
+++ b/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java
@@ -638,6 +638,10 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {
       masterJetty.stop();
       masterJetty.start();
 
+      // close and re-create master client because its connection pool has stale connections
+      masterClient.close();
+      masterClient = createNewSolrClient(masterJetty.getLocalPort());
+
       nDocs--;
       for (int i = 0; i < nDocs; i++)
         index(masterClient, "id", i, "name", "name = " + i);