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/03/02 03:21:04 UTC
lucene-solr:branch_6_6: SOLR-11993: LeaderInitiatedRecoveryThread
does not retry on UnknownHostException
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6_6 bad96329a -> c663d2c73
SOLR-11993: LeaderInitiatedRecoveryThread does not retry on UnknownHostException
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/c663d2c7
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/c663d2c7
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/c663d2c7
Branch: refs/heads/branch_6_6
Commit: c663d2c736e393b9e57f4e434254912899c3a611
Parents: bad9632
Author: Steve Rowe <sa...@gmail.com>
Authored: Thu Mar 1 22:16:41 2018 -0500
Committer: Steve Rowe <sa...@gmail.com>
Committed: Thu Mar 1 22:16:41 2018 -0500
----------------------------------------------------------------------
solr/CHANGES.txt | 2 ++
.../org/apache/solr/cloud/LeaderInitiatedRecoveryThread.java | 4 +++-
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c663d2c7/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index c376baf..35bc4c4 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -37,6 +37,8 @@ Bug Fixes
* SOLR-11503: Collections created with legacyCloud=true cannot be opened if legacyCloud=false (Erick Erickson)
+* SOLR-11993: LeaderInitiatedRecoveryThread does not retry on UnknownHostException (shalin, Cao Manh Dat, Steve Rowe)
+
================== 6.6.2 ==================
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/c663d2c7/solr/core/src/java/org/apache/solr/cloud/LeaderInitiatedRecoveryThread.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/LeaderInitiatedRecoveryThread.java b/solr/core/src/java/org/apache/solr/cloud/LeaderInitiatedRecoveryThread.java
index 4389d9e..d6b5d64 100644
--- a/solr/core/src/java/org/apache/solr/cloud/LeaderInitiatedRecoveryThread.java
+++ b/solr/core/src/java/org/apache/solr/cloud/LeaderInitiatedRecoveryThread.java
@@ -38,6 +38,7 @@ import org.slf4j.LoggerFactory;
import java.lang.invoke.MethodHandles;
import java.net.ConnectException;
import java.net.SocketException;
+import java.net.UnknownHostException;
import java.util.List;
/**
@@ -217,7 +218,8 @@ public class LeaderInitiatedRecoveryThread extends Thread {
(rootCause instanceof ConnectException ||
rootCause instanceof ConnectTimeoutException ||
rootCause instanceof NoHttpResponseException ||
- rootCause instanceof SocketException);
+ rootCause instanceof SocketException ||
+ rootCause instanceof UnknownHostException);
SolrException.log(log, recoveryUrl + ": Could not tell a replica to recover", t);