lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From markrmil...@apache.org
Subject lucene-solr:branch_6x: SOLR-10170: ClassCastException in RecoveryStrategy.
Date Wed, 22 Feb 2017 17:19:36 GMT
Repository: lucene-solr
Updated Branches:
  refs/heads/branch_6x 16d0ee3a4 -> 5fe5094c7


SOLR-10170: ClassCastException in RecoveryStrategy.

# Conflicts:
#	solr/CHANGES.txt


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

Branch: refs/heads/branch_6x
Commit: 5fe5094c70c250951ae4706af629ef57b403a6bc
Parents: 16d0ee3
Author: markrmiller <markrmiller@apache.org>
Authored: Sun Feb 19 20:38:25 2017 -0500
Committer: markrmiller <markrmiller@apache.org>
Committed: Wed Feb 22 12:19:24 2017 -0500

----------------------------------------------------------------------
 solr/CHANGES.txt                                          |  2 ++
 .../src/java/org/apache/solr/cloud/RecoveryStrategy.java  | 10 ++++++----
 2 files changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5fe5094c/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 57af50a..9aaa28d 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -130,6 +130,8 @@ Bug Fixes
 
 * SOLR-10063: CoreContainer shutdown has race condition that can cause a hang on shutdown.
(Mark Miller)
 
+* SOLR-10170: ClassCastException in RecoveryStrategy. (Mark Miller)
+
 Optimizations
 ----------------------
 

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5fe5094c/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java b/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java
index c05c5da..3bd2e74 100644
--- a/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java
+++ b/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java
@@ -591,10 +591,12 @@ public class RecoveryStrategy extends Thread implements Closeable {
         sendPrepRecoveryCmd(leaderBaseUrl, prepCmd);
         break;
       } catch (ExecutionException e) {
-        SolrServerException solrException = (SolrServerException) e.getCause();
-        if (solrException.getRootCause() instanceof SocketTimeoutException && numTries
< maxTries) {
-          LOG.warn("Socket timeout when send prep recovery cmd, retrying.. ");
-          continue;
+        if (e.getCause() instanceof SolrServerException) {
+          SolrServerException solrException = (SolrServerException) e.getCause();
+          if (solrException.getRootCause() instanceof SocketTimeoutException && numTries
< maxTries) {
+            LOG.warn("Socket timeout on send prep recovery cmd, retrying.. ");
+            continue;
+          }
         }
         throw  e;
       }


Mime
View raw message