You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2017/02/20 01:41:00 UTC
[5/5] lucene-solr:master: SOLR-10170: ClassCastException in
RecoveryStrategy.
SOLR-10170: ClassCastException in RecoveryStrategy.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/8c1e67e3
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/8c1e67e3
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/8c1e67e3
Branch: refs/heads/master
Commit: 8c1e67e30e071ceed636083532d4598bf6a8791f
Parents: 72f7127
Author: markrmiller <ma...@apache.org>
Authored: Sun Feb 19 20:38:25 2017 -0500
Committer: markrmiller <ma...@apache.org>
Committed: Sun Feb 19 20:38:32 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/8c1e67e3/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 3ccb2ce..cc3a3b2 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -167,6 +167,8 @@ Bug Fixes
* SOLR-10168: ShardSplit can fail with NPE in OverseerCollectionMessageHandler#waitForCoreAdminAsyncCallToComplete. (Mark Miller)
+* SOLR-10170: ClassCastException in RecoveryStrategy. (Mark Miller)
+
Optimizations
----------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8c1e67e3/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 02b7cbd..62d877b 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;
}