Skip to content

WebCmdlets get Retry-After from headers if StatusCode is 429 #18717

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
iSazonov merged 11 commits into from
Dec 14, 2022
Merged

WebCmdlets get Retry-After from headers if StatusCode is 429 #18717

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
6d963d2
Retry-After from headers if StatusCode is 429
CarloToso Dec 3, 2022
9713370
convert if-else to ternary operator
CarloToso Dec 3, 2022
1a4940a
use explicit type; fix Convert.ToInt32
CarloToso Dec 3, 2022
bc97fe3
Removed redundant code
CarloToso Dec 3, 2022
d204322
define local variable instead of WebSession.RetryIntervalInSeconds
CarloToso Dec 5, 2022
69e322d
R -> r
CarloToso Dec 5, 2022
59df9aa
remove linq; go back to if-else; try-catch
CarloToso Dec 6, 2022
5cf9233
Merge branch 'PowerShell:master' into WebCmdlets-respect-Retry-After-…
CarloToso Dec 6, 2022
32b455a
revert to using websession
CarloToso Dec 6, 2022
3d5757c
Update with suggestion
CarloToso Dec 6, 2022
6da6641
remove (int)
CarloToso Dec 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 23 additions & 3 deletions ...owerShell.Commands.Utility/commands/utility/WebCmdlet/Common/WebRequestPSCmdlet.Common.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -690,7 +690,7 @@ internal virtual void PrepareSession()
{
WebSession.MaximumRetryCount = MaximumRetryCount;

// only set retry interval if retry count is set.
// Only set retry interval if retry count is set.
WebSession.RetryIntervalInSeconds = RetryIntervalSec;
}
}
Expand Down Expand Up @@ -1439,16 +1439,36 @@ internal virtual HttpResponseMessage GetResponse(HttpClient client, HttpRequestM
// When MaximumRetryCount is not specified, the totalRequests == 1.
if (totalRequests > 1 && ShouldRetry(response.StatusCode))
{
int retryIntervalInSeconds = WebSession.RetryIntervalInSeconds;

// If the status code is 429 get the retry interval from the Headers.
// Ignore broken header and its value.
if (response.StatusCode is HttpStatusCode.Conflict && response.Headers.TryGetValues(HttpKnownHeaderNames.RetryAfter, out IEnumerable<string> retryAfter))
{
try
{
IEnumerator<string> enumerator = retryAfter.GetEnumerator();
if (enumerator.MoveNext())
{
retryIntervalInSeconds = Convert.ToInt32(enumerator.Current);
}
}
catch
{
// Ignore broken header.
}
}

string retryMessage = string.Format(
CultureInfo.CurrentCulture,
WebCmdletStrings.RetryVerboseMsg,
RetryIntervalSec,
retryIntervalInSeconds,
response.StatusCode);

WriteVerbose(retryMessage);

_cancelToken = new CancellationTokenSource();
Task.Delay(WebSession.RetryIntervalInSeconds * 1000, _cancelToken.Token).GetAwaiter().GetResult();
Task.Delay(retryIntervalInSeconds * 1000, _cancelToken.Token).GetAwaiter().GetResult();
_cancelToken.Cancel();
_cancelToken = null;

Expand Down