mirror
/
Lidarr
mirror of https://github.com/lidarr/Lidarr
1
0
Fork 0
Code Issues Releases Wiki Activity

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

This reverts commit fb025d9f68.
This commit is contained in:
Bogdan 2023-08-22 06:02:16 +03:00
parent fb025d9f68
commit 83bef513fb
1 changed files with 50 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
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,28 +56,35 @@ 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;
} }
} }
try var task = taskFactory.StartNew(() =>
{ {
var importListReports = importListLocal.Fetch(); try
{
var importListReports = importListLocal.Fetch();
lock (result) lock (result)
{ {
_logger.Debug("Found {0} reports from {1} ({2})", importListReports.Count, importList.Name, importListLocal.Definition.Name); _logger.Debug("Found {0} reports from {1} ({2})", importListReports.Count, importList.Name, importListLocal.Definition.Name);
result.AddRange(importListReports); result.AddRange(importListReports);
} }
_importListStatusService.UpdateListSyncStatus(importList.Definition.Id); _importListStatusService.UpdateListSyncStatus(importList.Definition.Id);
} }
catch (Exception e) catch (Exception e)
{ {
_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,25 +105,35 @@ 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;
try var task = taskFactory.StartNew(() =>
{ {
var importListReports = importListLocal.Fetch(); try
lock (result)
{ {
_logger.Debug("Found {0} reports from {1} ({2})", importListReports.Count, importList.Name, importListLocal.Definition.Name); var importListReports = importListLocal.Fetch();
result.AddRange(importListReports); lock (result)
{
_logger.Debug("Found {0} reports from {1} ({2})", importListReports.Count, importList.Name, importListLocal.Definition.Name);
result.AddRange(importListReports);
}
_importListStatusService.UpdateListSyncStatus(importList.Definition.Id);
} }
catch (Exception e)
{
_logger.Error(e, "Error during Import List Sync of {0} ({1})", importList.Name, importListLocal.Definition.Name);
}
}).LogExceptions();
_importListStatusService.UpdateListSyncStatus(importList.Definition.Id); taskList.Add(task);
}
catch (Exception e) Task.WaitAll(taskList.ToArray());
{
_logger.Error(e, "Error during Import List Sync of {0} ({1})", importList.Name, importListLocal.Definition.Name);
}
result = result.DistinctBy(r => new { r.Artist, r.Album }).ToList(); result = result.DistinctBy(r => new { r.Artist, r.Album }).ToList();