You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by da...@apache.org on 2018/03/29 11:38:25 UTC
lucene-solr:master: SOLR-12087: Check for exception message of
request recovery to remove LIR node
Repository: lucene-solr
Updated Branches:
refs/heads/master e96811c7a -> d7197b256
SOLR-12087: Check for exception message of request recovery to remove LIR node
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/d7197b25
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/d7197b25
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/d7197b25
Branch: refs/heads/master
Commit: d7197b2565de4388d584065c8af5c622cb3a1c4f
Parents: e96811c
Author: Cao Manh Dat <da...@apache.org>
Authored: Thu Mar 29 18:38:07 2018 +0700
Committer: Cao Manh Dat <da...@apache.org>
Committed: Thu Mar 29 18:38:07 2018 +0700
----------------------------------------------------------------------
.../org/apache/solr/cloud/LeaderInitiatedRecoveryThread.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d7197b25/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 01c32e5..071bfbf 100644
--- a/solr/core/src/java/org/apache/solr/cloud/LeaderInitiatedRecoveryThread.java
+++ b/solr/core/src/java/org/apache/solr/cloud/LeaderInitiatedRecoveryThread.java
@@ -237,12 +237,12 @@ public class LeaderInitiatedRecoveryThread extends Thread {
continueTrying = false;
}
- if (CloudUtil.replicaExists(zkController.getClusterState(), collection, shardId, replicaCoreNodeName)) {
- SolrException.log(log, recoveryUrl + ": Could not tell a replica to recover, wasCommError:"+wasCommError, t);
- } else {
+ if (rootCause.getMessage().contains("Unable to locate core")) {
log.info("Replica {} is removed, hence remove its lir state", replicaCoreNodeName);
removeLIRState(replicaCoreNodeName);
break;
+ } else {
+ SolrException.log(log, recoveryUrl + ": Could not tell a replica to recover, wasCommError:"+wasCommError, t);
}
}
}