Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-5232: fix retry logic 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1538112 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Mark Robert Miller 2013-11-02 00:46:50 +00:00
parent d24357e87b
commit f412b66a51
1 changed files with 29 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java
View File

@ -69,10 +69,9 @@ public class SolrCmdDistributor {
List<Error> errors = new ArrayList<Error>(this.errors); List<Error> errors = new ArrayList<Error>(this.errors);
errors.addAll(servers.getErrors()); errors.addAll(servers.getErrors());
allErrors.addAll(errors);
boolean blockUntilFinishedAgain = false; boolean blockUntilFinishedAgain = false;
for (Error err : errors) { for (Error err : errors) {
try {
String oldNodeUrl = err.req.node.getUrl(); String oldNodeUrl = err.req.node.getUrl();
// if there is a retry url, we want to retry... // if there is a retry url, we want to retry...
@ -80,8 +79,7 @@ public class SolrCmdDistributor {
boolean doRetry = false; boolean doRetry = false;
int rspCode = err.statusCode; int rspCode = err.statusCode;
if (testing_errorHook != null) Diagnostics.call(testing_errorHook, if (testing_errorHook != null) Diagnostics.call(testing_errorHook, err.e);
err.e);
// this can happen in certain situations such as shutdown // this can happen in certain situations such as shutdown
if (isRetry) { if (isRetry) {
@ -98,13 +96,11 @@ public class SolrCmdDistributor {
doRetry = true; doRetry = true;
} }
} }
} if (err.req.retries < MAX_RETRIES_ON_FORWARD && doRetry) {
if (isRetry && err.req.retries < MAX_RETRIES_ON_FORWARD && doRetry) {
err.req.retries++; err.req.retries++;
SolrException.log(SolrCmdDistributor.log, "forwarding update to " SolrException.log(SolrCmdDistributor.log, "forwarding update to "
+ oldNodeUrl + " failed - retrying ... "); + oldNodeUrl + " failed - retrying ... retries: " + err.req.retries);
try { try {
Thread.sleep(500); Thread.sleep(500);
} catch (InterruptedException e) { } catch (InterruptedException e) {
@ -114,9 +110,11 @@ public class SolrCmdDistributor {
submit(err.req); submit(err.req);
blockUntilFinishedAgain = true; blockUntilFinishedAgain = true;
} else {
allErrors.add(err);
} }
} catch (Exception e) { } else {
SolrException.log(log, "Retry attempt failed", e); allErrors.add(err);
} }
} }