Git development
 help / color / mirror / Atom feed
From: Patrick Steinhardt <ps@pks.im>
To: Ravi Mistry via GitGitGadget <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org,
	Vaidas Pilkauskas <vaidas.pilkauskas@shopify.com>,
	"brian m. carlson" <sandals@crustytoothpaste.net>,
	Ravi Mistry <rmistry@google.com>
Subject: Re: [PATCH v3 2/5] http: add exponential backoff without Retry-After
Date: Wed, 18 Nov 2026 13:00:35 +0100	[thread overview]
Message-ID: <av2TY6Oqm-LzA5NW@pks.im> (raw)
In-Reply-To: <fe1e847dede7579da911b5a9ba16c806b5332723.1794022836.git.gitgitgadget@gmail.com>

On Sat, Nov 07, 2026 at 03:40:33AM +0000, Ravi Mistry via GitGitGadget wrote:
> diff --git a/Documentation/config/http.adoc b/Documentation/config/http.adoc
> index 792a71b413..8e7538ab76 100644
> --- a/Documentation/config/http.adoc
> +++ b/Documentation/config/http.adoc
> @@ -327,9 +327,14 @@ http.keepAliveCount::
>  	`GIT_HTTP_KEEPALIVE_COUNT` environment variable.
>  
>  http.retryAfter::
> -	Default wait time in seconds before retrying when a server returns
> +	Initial wait time in seconds before retrying when a server returns
>  	HTTP 429 (Too Many Requests) without a Retry-After header.
> -	Defaults to 0 (retry immediately). When a Retry-After header is
> +	Defaults to 0, which retries immediately without waiting on every
> +	attempt (unless a Retry-After header is present). When set to a
> +	positive value and no Retry-After header is present, the first
> +	retry waits `http.retryAfter` seconds and the delay doubles on
> +	each subsequent retry attempt (`http.retryAfter * 2^(attempt - 1)`),
> +	capped at `http.maxRetryTime`. When a Retry-After header is
>  	present, its value takes precedence over this setting; however,
>  	automatic use of the server-provided `Retry-After` header requires
>  	libcurl 7.66.0 or later. On older versions, configure this setting

Okay, having exponential backoff makes sense to me, and we do limit the
maximum backoff via `http.maxRetryTime`. What I wonder is whether it
would also make sense to introduce some jitter, but that of course does
not have to be part of thi spatch series.

> diff --git a/http.c b/http.c
> index 0308f973a6..8a28cd0fb3 100644
> --- a/http.c
> +++ b/http.c
> @@ -2411,7 +2411,7 @@ static int update_url_from_redirect(struct strbuf *base,
>   * Returns a negative value if configuration is invalid (delay exceeds
>   * http.maxRetryTime), otherwise returns the delay in seconds (>= 0).
>   */
> -static long handle_rate_limit_retry(long slot_retry_after)
> +static long handle_rate_limit_retry(long slot_retry_after, int attempt)
>  {
>  	/* Use the slot-specific retry_after value or configured default */
>  	if (slot_retry_after >= 0) {

Nit: a bit weird that the number of attempts is signed.

> @@ -2437,7 +2439,14 @@ static long handle_rate_limit_retry(long slot_retry_after)
>  		}
>  		trace2_data_string("http", the_repository,
>  			"http/429-retry-source", "config-default");
> -		return http_retry_after;
> +		for (int a = 1; a < attempt && delay > 0; a++) {
> +			if (delay >= http_max_retry_time - delay) {
> +				delay = http_max_retry_time;
> +				break;
> +			}
> +			delay *= 2;

Isn't this the same as `MIN(http_max_retry_time, delay * (2 <<
attempts - 1)`? Feels a bit convoluted to have a whole loop for this.

Patrick

  reply	other threads:[~2026-11-18 12:00 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-10-31 15:57 [PATCH 0/4] http: exponential backoff, configurable status codes, and post_rpc() retries Ravi Mistry via GitGitGadget
2026-10-31 15:57 ` [PATCH 1/4] http: fix retry count and Retry-After timing Ravi Mistry via GitGitGadget
2026-11-03  1:03   ` Junio C Hamano
2026-11-03 19:05     ` Ravi Mistry
2026-10-31 15:57 ` [PATCH 2/4] http: add exponential backoff without Retry-After Ravi Mistry via GitGitGadget
2026-11-03 13:21   ` Junio C Hamano
2026-11-03 19:05     ` Ravi Mistry
2026-10-31 15:57 ` [PATCH 3/4] http: add http.retryStatusCodes config option Ravi Mistry via GitGitGadget
2026-11-03 13:41   ` Junio C Hamano
2026-11-03 19:06     ` Ravi Mistry
2026-10-31 15:57 ` [PATCH 4/4] remote-curl: retry transient HTTP errors in post_rpc() Ravi Mistry via GitGitGadget
2026-11-03 14:47   ` Junio C Hamano
2026-11-03 18:57 ` [PATCH v2 0/4] http: exponential backoff, configurable status codes, and post_rpc() retries Ravi Mistry via GitGitGadget
2026-11-03 18:57   ` [PATCH v2 1/4] http: fix retry count and Retry-After timing Ravi Mistry via GitGitGadget
2026-11-03 18:57   ` [PATCH v2 2/4] http: add exponential backoff without Retry-After Ravi Mistry via GitGitGadget
2026-11-04 22:05     ` brian m. carlson
2026-11-05  0:10       ` Ravi Mistry
2026-11-05 17:45         ` Junio C Hamano
2026-11-05 22:32         ` brian m. carlson
2026-11-06 16:27           ` Ravi Mistry
2026-11-03 18:57   ` [PATCH v2 3/4] http: add http.retryStatusCodes config option Ravi Mistry via GitGitGadget
2026-11-03 20:56     ` Junio C Hamano
2026-11-03 18:57   ` [PATCH v2 4/4] remote-curl: retry transient HTTP errors in post_rpc() Ravi Mistry via GitGitGadget
2026-11-07  3:40 ` [PATCH v3 0/5] http: exponential backoff, configurable status codes, and post_rpc() retries Ravi Mistry via GitGitGadget
2026-11-07  3:40   ` [PATCH v3 1/5] http: fix retry count and Retry-After timing Ravi Mistry via GitGitGadget
2026-11-18 12:00     ` Patrick Steinhardt
2026-11-07  3:40   ` [PATCH v3 2/5] http: add exponential backoff without Retry-After Ravi Mistry via GitGitGadget
2026-11-18 12:00     ` Patrick Steinhardt [this message]
2026-11-07  3:40   ` [PATCH v3 3/5] http: add http.retryStatusCodes config option Ravi Mistry via GitGitGadget
2026-11-18 12:00     ` Patrick Steinhardt
2026-11-07  3:40   ` [PATCH v3 4/5] remote-curl: retry transient HTTP errors in post_rpc() Ravi Mistry via GitGitGadget
2026-11-18 12:01     ` Patrick Steinhardt
2026-11-07  3:40   ` [PATCH v3 5/5] http: default http.retryAfter to 10 seconds Ravi Mistry via GitGitGadget
2026-11-18 12:01     ` Patrick Steinhardt
2026-11-07  4:37   ` [PATCH v3 0/5] http: exponential backoff, configurable status codes, and post_rpc() retries Junio C Hamano
2026-11-10  3:58     ` Ravi Mistry

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=av2TY6Oqm-LzA5NW@pks.im \
    --to=ps@pks.im \
    --cc=git@vger.kernel.org \
    --cc=gitgitgadget@gmail.com \
    --cc=rmistry@google.com \
    --cc=sandals@crustytoothpaste.net \
    --cc=vaidas.pilkauskas@shopify.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox