From commits-return-103432-archive-asf-public=cust-asf.ponee.io@lucene.apache.org Thu Sep 13 23:10:56 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id E1A6018067A for ; Thu, 13 Sep 2018 23:10:55 +0200 (CEST) Received: (qmail 6469 invoked by uid 500); 13 Sep 2018 21:10:55 -0000 Mailing-List: contact commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@lucene.apache.org Delivered-To: mailing list commits@lucene.apache.org Received: (qmail 6455 invoked by uid 99); 13 Sep 2018 21:10:54 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 13 Sep 2018 21:10:54 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 59B04E0058; Thu, 13 Sep 2018 21:10:54 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tflobbe@apache.org To: commits@lucene.apache.org Date: Thu, 13 Sep 2018 21:10:55 -0000 Message-Id: <3105d5c6d10e4b8492a67d3f1bf1fd50@git.apache.org> In-Reply-To: <14a6677dec2e40cea1a3ba59bd5eaf09@git.apache.org> References: <14a6677dec2e40cea1a3ba59bd5eaf09@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] lucene-solr:branch_7_5: SOLR-12766: Backoff time for internal requests is never more than 2 seconds SOLR-12766: Backoff time for internal requests is never more than 2 seconds Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/f5b00707 Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/f5b00707 Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/f5b00707 Branch: refs/heads/branch_7_5 Commit: f5b00707a6064a34af013b2e18c322d613926319 Parents: 2ce0f52 Author: Tomas Fernandez Lobbe Authored: Thu Sep 13 08:43:10 2018 -0700 Committer: Tomas Fernandez Lobbe Committed: Thu Sep 13 14:09:17 2018 -0700 ---------------------------------------------------------------------- solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f5b00707/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 3a65f17..d7388f0 100644 --- a/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java +++ b/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java @@ -170,7 +170,7 @@ 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; + int backoffTime = Math.min(retryPause * resubmitList.get(0).req.retries, 2000); log.debug("Sleeping {}ms before re-submitting {} requests", backoffTime, resubmitList.size()); Thread.sleep(backoffTime); } catch (InterruptedException e) {