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/09/14 03:30:56 UTC
[39/43] lucene-solr:jira/http2: SOLR-12766: Improve backoff for
internal retries
SOLR-12766: Improve backoff for internal retries
When retrying internal update requests, backoff only once for the full batch of retries
instead of for every request.
Make backoff linear with the number of retries
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/4a5b914e
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/4a5b914e
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/4a5b914e
Branch: refs/heads/jira/http2
Commit: 4a5b914eaa8683009191748bf6c0b1be14d59661
Parents: 6e8c05f
Author: Tomas Fernandez Lobbe <tf...@apache.org>
Authored: Wed Sep 12 16:29:17 2018 -0700
Committer: Tomas Fernandez Lobbe <tf...@apache.org>
Committed: Wed Sep 12 21:11:34 2018 -0700
----------------------------------------------------------------------
solr/CHANGES.txt | 2 ++
.../apache/solr/update/SolrCmdDistributor.java | 21 +++++++++++++-------
2 files changed, 16 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4a5b914e/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 113ca13..64b8e58 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -385,6 +385,8 @@ Optimizations
* SOLR-12723: Reduce object creation in HashBasedRouter. (ab)
+* SOLR-12766: When retrying internal requests, backoff only once for the full batch of retries (Tomás Fernández Löbbe)
+
Other Changes
----------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4a5b914e/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java b/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java
index d5aafec..3a65f17 100644
--- a/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java
+++ b/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java
@@ -79,7 +79,8 @@ public class SolrCmdDistributor implements Closeable {
this.completionService = new ExecutorCompletionService<>(updateShardHandler.getUpdateExecutor());
}
- public SolrCmdDistributor(StreamingSolrClients clients, int retryPause) {
+ /* For tests only */
+ SolrCmdDistributor(StreamingSolrClients clients, int retryPause) {
this.clients = clients;
this.retryPause = retryPause;
completionService = new ExecutorCompletionService<>(clients.getUpdateExecutor());
@@ -156,12 +157,6 @@ public class SolrCmdDistributor implements Closeable {
+ err.req.cmd.toString() + " params:"
+ err.req.uReq.getParams() + " rsp:" + err.statusCode, err.e);
}
- try {
- Thread.sleep(retryPause); //TODO: Do we want this wait for every error?
- } catch (InterruptedException e) {
- Thread.currentThread().interrupt();
- log.warn(null, e);
- }
resubmitList.add(err);
} else {
allErrors.add(err);
@@ -172,6 +167,18 @@ public class SolrCmdDistributor implements Closeable {
}
}
+ if (resubmitList.size() > 0) {
+ // Only backoff once for the full batch
+ try {
+ int backoffTime = retryPause * resubmitList.get(0).req.retries;
+ log.debug("Sleeping {}ms before re-submitting {} requests", backoffTime, resubmitList.size());
+ Thread.sleep(backoffTime);
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
+ log.warn(null, e);
+ }
+ }
+
clients.clearErrors();
this.errors.clear();
for (Error err : resubmitList) {