Skip to content

Commit

Permalink
New: Retry on failed downloads of torrent and nzb files
Browse files Browse the repository at this point in the history
(cherry picked from commit bc20ef73bdd47b7cdad43d4c7d4b4bd534e49252)

Closes #9528
  • Loading branch information
mynameisbogdan committed Dec 31, 2023
1 parent 5d7e230 commit e29717e
Show file tree
Hide file tree
Showing 4 changed files with 43 additions and 6 deletions.
40 changes: 36 additions & 4 deletions src/NzbDrone.Core/Download/DownloadClientBase.cs
@@ -1,16 +1,20 @@
using System;
using System.Collections.Generic;
using System.Net;
using System.Threading.Tasks;
using FluentValidation.Results;
using NLog;
using NzbDrone.Common.Disk;
using NzbDrone.Common.Http;
using NzbDrone.Core.Configuration;
using NzbDrone.Core.Indexers;
using NzbDrone.Core.Organizer;
using NzbDrone.Core.Parser.Model;
using NzbDrone.Core.RemotePathMappings;
using NzbDrone.Core.ThingiProvider;
using NzbDrone.Core.Validation;
using Polly;
using Polly.Retry;

namespace NzbDrone.Core.Download
{
Expand All @@ -23,6 +27,37 @@ public abstract class DownloadClientBase<TSettings> : IDownloadClient
protected readonly IRemotePathMappingService _remotePathMappingService;
protected readonly Logger _logger;

protected ResiliencePipeline<HttpResponse> RetryStrategy => new ResiliencePipelineBuilder<HttpResponse>()
.AddRetry(new RetryStrategyOptions<HttpResponse>
{
ShouldHandle = static args => args.Outcome switch
{
{ Result.HasHttpServerError: true } => PredicateResult.True(),
{ Result.StatusCode: HttpStatusCode.RequestTimeout } => PredicateResult.True(),
_ => PredicateResult.False()
},
Delay = TimeSpan.FromSeconds(3),
MaxRetryAttempts = 2,
BackoffType = DelayBackoffType.Exponential,
UseJitter = true,
OnRetry = args =>
{
var exception = args.Outcome.Exception;
if (exception is not null)
{
_logger.Info(exception, "Request for {0} failed with exception '{1}'. Retrying in {2}s.", Definition.Name, exception.Message, args.RetryDelay.TotalSeconds);
}
else
{
_logger.Info("Request for {0} failed with status {1}. Retrying in {2}s.", Definition.Name, args.Outcome.Result?.StatusCode, args.RetryDelay.TotalSeconds);
}
return default;
}
})
.Build();

public abstract string Name { get; }

public Type ConfigContract => typeof(TSettings);
Expand Down Expand Up @@ -58,10 +93,7 @@ public override string ToString()
return GetType().Name;
}

public abstract DownloadProtocol Protocol
{
get;
}
public abstract DownloadProtocol Protocol { get; }

public abstract Task<string> Download(RemoteMovie remoteMovie, IIndexer indexer);
public abstract IEnumerable<DownloadClientItem> GetItems();
Expand Down
4 changes: 3 additions & 1 deletion src/NzbDrone.Core/Download/TorrentClientBase.cs
Expand Up @@ -134,7 +134,9 @@ private async Task<string> DownloadFromWebUrl(RemoteMovie remoteMovie, IIndexer
request.Headers.Accept = "application/x-bittorrent";
request.AllowAutoRedirect = false;

var response = await _httpClient.GetAsync(request);
var response = await RetryStrategy
.ExecuteAsync(static async (state, _) => await state._httpClient.GetAsync(state.request), (_httpClient, request))
.ConfigureAwait(false);

if (response.StatusCode == HttpStatusCode.MovedPermanently ||
response.StatusCode == HttpStatusCode.Found ||
Expand Down
4 changes: 3 additions & 1 deletion src/NzbDrone.Core/Download/UsenetClientBase.cs
Expand Up @@ -48,7 +48,9 @@ public override async Task<string> Download(RemoteMovie remoteMovie, IIndexer in
var request = indexer?.GetDownloadRequest(url) ?? new HttpRequest(url);
request.RateLimitKey = remoteMovie?.Release?.IndexerId.ToString();

var response = await _httpClient.GetAsync(request);
var response = await RetryStrategy
.ExecuteAsync(static async (state, _) => await state._httpClient.GetAsync(state.request), (_httpClient, request))
.ConfigureAwait(false);

nzbData = response.ResponseData;

Expand Down
1 change: 1 addition & 0 deletions src/NzbDrone.Core/Radarr.Core.csproj
Expand Up @@ -8,6 +8,7 @@
<PackageReference Include="Equ" Version="2.3.0" />
<PackageReference Include="MailKit" Version="3.6.0" />
<PackageReference Include="Npgsql" Version="7.0.6" />
<PackageReference Include="Polly" Version="8.2.0" />
<PackageReference Include="Servarr.FFMpegCore" Version="4.7.0-26" />
<PackageReference Include="Servarr.FFprobe" Version="5.1.4.112" />
<PackageReference Include="System.Memory" Version="4.5.5" />
Expand Down

0 comments on commit e29717e

Please sign in to comment.