github/lidarr
1
0
Fork 0
mirror of https://github.com/lidarr/lidarr.git synced 2025-08-19 13:10:13 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Revert "Switch to Parallel.ForEach for list processing with MaxParallelism"

Browse source 
This reverts commit fb025d9f68.
This commit is contained in:
Bogdan 2023-08-22 06:02:16 +03:00
commit 83bef513fb
1 changed files with 50 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/NzbDrone.Core/ImportLists/FetchAndParseImportListService.cs
View file

@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using NLog; using NLog;
using NzbDrone.Common.TPL;
using NzbDrone.Core.Parser.Model; using NzbDrone.Core.Parser.Model;
namespace NzbDrone.Core.ImportLists namespace NzbDrone.Core.ImportLists
@ -40,7 +41,10 @@ namespace NzbDrone.Core.ImportLists
_logger.Debug("Available import lists {0}", importLists.Count); _logger.Debug("Available import lists {0}", importLists.Count);
Parallel.ForEach(importLists, new ParallelOptions { MaxDegreeOfParallelism = 5 }, importList => var taskList = new List<Task>();
var taskFactory = new TaskFactory(TaskCreationOptions.LongRunning, TaskContinuationOptions.None);
foreach (var importList in importLists)
{ {
var importListLocal = importList; var importListLocal = importList;
var importListStatus = _importListStatusService.GetLastSyncListInfo(importListLocal.Definition.Id); var importListStatus = _importListStatusService.GetLastSyncListInfo(importListLocal.Definition.Id);
@ -52,10 +56,12 @@ namespace NzbDrone.Core.ImportLists
if (DateTime.UtcNow < importListNextSync) if (DateTime.UtcNow < importListNextSync)
{ {
_logger.Trace("Skipping refresh of Import List {0} ({1}) due to minimum refresh interval. Next sync after {2}", importList.Name, importListLocal.Definition.Name, importListNextSync); _logger.Trace("Skipping refresh of Import List {0} ({1}) due to minimum refresh interval. Next sync after {2}", importList.Name, importListLocal.Definition.Name, importListNextSync);
return; continue;
} }
} }
var task = taskFactory.StartNew(() =>
{
try try
{ {
var importListReports = importListLocal.Fetch(); var importListReports = importListLocal.Fetch();
@ -73,7 +79,12 @@ namespace NzbDrone.Core.ImportLists
{ {
_logger.Error(e, "Error during Import List Sync of {0} ({1})", importList.Name, importListLocal.Definition.Name); _logger.Error(e, "Error during Import List Sync of {0} ({1})", importList.Name, importListLocal.Definition.Name);
} }
}); }).LogExceptions();
taskList.Add(task);
}
Task.WaitAll(taskList.ToArray());
result = result.DistinctBy(r => new { r.Artist, r.Album }).ToList(); result = result.DistinctBy(r => new { r.Artist, r.Album }).ToList();
@ -94,8 +105,13 @@ namespace NzbDrone.Core.ImportLists
return result; return result;
} }
var taskList = new List<Task>();
var taskFactory = new TaskFactory(TaskCreationOptions.LongRunning, TaskContinuationOptions.None);
var importListLocal = importList; var importListLocal = importList;
var task = taskFactory.StartNew(() =>
{
try try
{ {
var importListReports = importListLocal.Fetch(); var importListReports = importListLocal.Fetch();
@ -113,6 +129,11 @@ namespace NzbDrone.Core.ImportLists
{ {
_logger.Error(e, "Error during Import List Sync of {0} ({1})", importList.Name, importListLocal.Definition.Name); _logger.Error(e, "Error during Import List Sync of {0} ({1})", importList.Name, importListLocal.Definition.Name);
} }
}).LogExceptions();
taskList.Add(task);
Task.WaitAll(taskList.ToArray());
result = result.DistinctBy(r => new { r.Artist, r.Album }).ToList(); result = result.DistinctBy(r => new { r.Artist, r.Album }).ToList();