You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2018/04/11 02:15:58 UTC
[2/2] lucene-solr:branch_7x: SOLR-12201:
TestReplicationHandler.doTestIndexFetchOnMasterRestart(): handle unexpected
replication failures
SOLR-12201: TestReplicationHandler.doTestIndexFetchOnMasterRestart(): handle unexpected replication failures
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/66816b04
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/66816b04
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/66816b04
Branch: refs/heads/branch_7x
Commit: 66816b045147806b49d99d3f252989674f610441
Parents: 89c364c
Author: Steve Rowe <sa...@apache.org>
Authored: Tue Apr 10 22:15:31 2018 -0400
Committer: Steve Rowe <sa...@apache.org>
Committed: Tue Apr 10 22:15:49 2018 -0400
----------------------------------------------------------------------
solr/CHANGES.txt | 3 +++
.../apache/solr/handler/TestReplicationHandler.java | 14 ++++++++------
2 files changed, 11 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/66816b04/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 73866c6..eac2024 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -111,6 +111,9 @@ Bug Fixes
(ab, Dawid Weiss, Mikhail Khludnev)
* SOLR-12155: Exception from UnInvertedField constructor puts threads to infinite wait. (Mikhail Khludnev)
+
+* SOLR-12201: TestReplicationHandler.doTestIndexFetchOnMasterRestart(): handle unexpected replication failures
+ (Steve Rowe)
Optimizations
----------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/66816b04/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 e4b7fa3..8c24754 100644
--- a/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java
+++ b/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java
@@ -626,9 +626,6 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {
* the index hasn't changed. See SOLR-9036
*/
@Test
- //Commented out 24-Feb 2018. JIRA marked as fixed.
- // Still fails 26-Feb on master.
- @BadApple(bugUrl = "https://issues.apache.org/jira/browse/SOLR-9036")
public void doTestIndexFetchOnMasterRestart() throws Exception {
useFactory(null);
try {
@@ -663,9 +660,14 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {
String cmp = BaseDistributedSearchTestCase.compare(masterQueryResult, slaveQueryResult, 0, null);
assertEquals(null, cmp);
- assertEquals(1, Integer.parseInt(getSlaveDetails("timesIndexReplicated")));
+ int timesReplicated = Integer.parseInt(getSlaveDetails("timesIndexReplicated"));
String timesFailed = getSlaveDetails("timesFailed");
- assertEquals(0, Integer.parseInt(timesFailed != null ? timesFailed : "0"));
+ if (null == timesFailed) {
+ timesFailed = "0";
+ }
+ 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();
@@ -683,7 +685,7 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {
assertEquals(nDocs, numFound(slaveQueryRsp));
int failed = Integer.parseInt(getSlaveDetails("timesFailed"));
- assertTrue(failed > 0);
+ assertTrue(failed > previousTimesFailed);
assertEquals(1, Integer.parseInt(getSlaveDetails("timesIndexReplicated")) - failed);
} finally {
resetFactory();