Skip to content

Retry PublishArtifacts download on all exceptions #7750

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
garath merged 3 commits into from
Aug 14, 2021
Merged

Retry PublishArtifacts download on all exceptions #7750

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6ad23bf
Retry PublishArtifacts download on all exceptions
garath Aug 13, 2021
347bff2
Remove log line, fixup exception reporting
garath Aug 13, 2021
4f32bda
Fix tests
garath Aug 13, 2021
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
4 changes: 2 additions & 2 deletions src/Microsoft.DotNet.Build.Tasks.Feed.Tests/PublishToSymbolServerTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ public async Task DownloadFileAsyncFailsForInValidUrlTest(HttpStatusCode httpSta
"1234",
"test.txt",
path));
Assert.Contains($"Failed to download local file '{path}' after {publishTask.RetryHandler.MaxAttempts} attempts. See inner exception for details,", actualError.Message);
Assert.Contains($"Failed to download local file '{path}' after {publishTask.RetryHandler.MaxAttempts} attempts. See inner exception for details.", actualError.Message);
}

[Theory]
Expand Down Expand Up @@ -259,7 +259,7 @@ public async Task DownloadFailureWhenStatusCodeIsInvalid(HttpStatusCode httpStat
"1234",
"test.txt",
path));
Assert.Contains($"Failed to download local file '{path}' after {publishTask.RetryHandler.MaxAttempts} attempts. See inner exception for details,", actualError.Message);
Assert.Contains($"Failed to download local file '{path}' after {publishTask.RetryHandler.MaxAttempts} attempts. See inner exception for details.", actualError.Message);
}

[Theory]
Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft.DotNet.Build.Tasks.Feed/src/PublishArtifactsInManifestBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -957,7 +957,7 @@ public async Task DownloadFileAsync(

return true;
}
catch (Exception toStore) when (toStore is HttpRequestException || toStore is TaskCanceledException || toStore is SocketException)
catch (Exception toStore)
{
mostRecentlyCaughtException = toStore;
return false;
Expand All @@ -967,7 +967,7 @@ public async Task DownloadFileAsync(
if (!success)
{
throw new Exception(
$"Failed to download local file '{path}' after {RetryHandler.MaxAttempts} attempts. See inner exception for details, {mostRecentlyCaughtException}");
$"Failed to download local file '{path}' after {RetryHandler.MaxAttempts} attempts. See inner exception for details.", mostRecentlyCaughtException);
}
}

Expand Down