From a45b91abe8ed9c194c23b75bc2995a7db957ad52 Mon Sep 17 00:00:00 2001 From: Qstick Date: Thu, 31 Mar 2022 21:21:02 -0500 Subject: [PATCH] New: Schedule refresh and process monitored download tasks at high priority Co-Authored-By: Mark McDowall --- src/NzbDrone.Core/Datastore/TableMapping.cs | 3 +- .../DownloadMonitoringService.cs | 4 +- src/NzbDrone.Core/Jobs/ScheduledTask.cs | 7 ++ src/NzbDrone.Core/Jobs/Scheduler.cs | 4 +- src/NzbDrone.Core/Jobs/TaskManager.cs | 77 +++++++++++++++---- .../Commands/CommandPriorityComparer.cs | 32 ++++++++ .../Commands/CommandController.cs | 7 +- 7 files changed, 112 insertions(+), 22 deletions(-) create mode 100644 src/NzbDrone.Core/Messaging/Commands/CommandPriorityComparer.cs diff --git a/src/NzbDrone.Core/Datastore/TableMapping.cs b/src/NzbDrone.Core/Datastore/TableMapping.cs index 16e391533..6972c2994 100644 --- a/src/NzbDrone.Core/Datastore/TableMapping.cs +++ b/src/NzbDrone.Core/Datastore/TableMapping.cs @@ -66,7 +66,8 @@ namespace NzbDrone.Core.Datastore .Ignore(r => r.FreeSpace) .Ignore(r => r.TotalSpace); - Mapper.Entity("ScheduledTasks").RegisterModel(); + Mapper.Entity("ScheduledTasks").RegisterModel() + .Ignore(i => i.Priority); Mapper.Entity("Indexers").RegisterModel() .Ignore(x => x.ImplementationName) diff --git a/src/NzbDrone.Core/Download/TrackedDownloads/DownloadMonitoringService.cs b/src/NzbDrone.Core/Download/TrackedDownloads/DownloadMonitoringService.cs index 0963a346c..b389028a5 100644 --- a/src/NzbDrone.Core/Download/TrackedDownloads/DownloadMonitoringService.cs +++ b/src/NzbDrone.Core/Download/TrackedDownloads/DownloadMonitoringService.cs @@ -54,7 +54,7 @@ namespace NzbDrone.Core.Download.TrackedDownloads private void QueueRefresh() { - _manageCommandQueue.Push(new RefreshMonitoredDownloadsCommand()); + _manageCommandQueue.Push(new RefreshMonitoredDownloadsCommand(), CommandPriority.High); } private void Refresh() @@ -75,7 +75,7 @@ namespace NzbDrone.Core.Download.TrackedDownloads _trackedDownloadService.UpdateTrackable(trackedDownloads); _eventAggregator.PublishEvent(new TrackedDownloadRefreshedEvent(trackedDownloads)); - _manageCommandQueue.Push(new ProcessMonitoredDownloadsCommand()); + _manageCommandQueue.Push(new ProcessMonitoredDownloadsCommand(), CommandPriority.High); } finally { diff --git a/src/NzbDrone.Core/Jobs/ScheduledTask.cs b/src/NzbDrone.Core/Jobs/ScheduledTask.cs index 3cdfa3132..82c948b2f 100644 --- a/src/NzbDrone.Core/Jobs/ScheduledTask.cs +++ b/src/NzbDrone.Core/Jobs/ScheduledTask.cs @@ -1,5 +1,6 @@ using System; using NzbDrone.Core.Datastore; +using NzbDrone.Core.Messaging.Commands; namespace NzbDrone.Core.Jobs { @@ -9,5 +10,11 @@ namespace NzbDrone.Core.Jobs public int Interval { get; set; } public DateTime LastExecution { get; set; } public DateTime LastStartTime { get; set; } + public CommandPriority Priority { get; set; } + + public ScheduledTask() + { + Priority = CommandPriority.Low; + } } } diff --git a/src/NzbDrone.Core/Jobs/Scheduler.cs b/src/NzbDrone.Core/Jobs/Scheduler.cs index dffe4dba7..54e243467 100644 --- a/src/NzbDrone.Core/Jobs/Scheduler.cs +++ b/src/NzbDrone.Core/Jobs/Scheduler.cs @@ -1,4 +1,4 @@ -using System.Linq; +using System.Linq; using System.Threading; using System.Threading.Tasks; using NLog; @@ -39,7 +39,7 @@ namespace NzbDrone.Core.Jobs foreach (var task in tasks) { - _commandQueueManager.Push(task.TypeName, task.LastExecution, task.LastStartTime, CommandPriority.Low, CommandTrigger.Scheduled); + _commandQueueManager.Push(task.TypeName, task.LastExecution, task.LastStartTime, task.Priority, CommandTrigger.Scheduled); } } finally diff --git a/src/NzbDrone.Core/Jobs/TaskManager.cs b/src/NzbDrone.Core/Jobs/TaskManager.cs index 29d494517..498cb53d2 100644 --- a/src/NzbDrone.Core/Jobs/TaskManager.cs +++ b/src/NzbDrone.Core/Jobs/TaskManager.cs @@ -2,6 +2,7 @@ using System; using System.Collections.Generic; using System.Linq; using NLog; +using NzbDrone.Common.Cache; using NzbDrone.Core.Backup; using NzbDrone.Core.Configuration; using NzbDrone.Core.Configuration.Events; @@ -31,42 +32,74 @@ namespace NzbDrone.Core.Jobs private readonly IScheduledTaskRepository _scheduledTaskRepository; private readonly IConfigService _configService; private readonly Logger _logger; + private readonly ICached _cache; - public TaskManager(IScheduledTaskRepository scheduledTaskRepository, IConfigService configService, Logger logger) + public TaskManager(IScheduledTaskRepository scheduledTaskRepository, IConfigService configService, ICacheManager cacheManager, Logger logger) { _scheduledTaskRepository = scheduledTaskRepository; _configService = configService; + _cache = cacheManager.GetCache(GetType()); _logger = logger; } public IList GetPending() { - return _scheduledTaskRepository.All() - .Where(c => c.Interval > 0 && c.LastExecution.AddMinutes(c.Interval) < DateTime.UtcNow) - .ToList(); + return _cache.Values + .Where(c => c.Interval > 0 && c.LastExecution.AddMinutes(c.Interval) < DateTime.UtcNow) + .ToList(); } public List GetAll() { - return _scheduledTaskRepository.All().ToList(); + return _cache.Values.ToList(); } public DateTime GetNextExecution(Type type) { - var scheduledTask = _scheduledTaskRepository.All().Single(v => v.TypeName == type.FullName); + var scheduledTask = _cache.Find(type.FullName); + return scheduledTask.LastExecution.AddMinutes(scheduledTask.Interval); } public void Handle(ApplicationStartedEvent message) { - var defaultTasks = new[] + var defaultTasks = new List { - new ScheduledTask { Interval = 5, TypeName = typeof(MessagingCleanupCommand).FullName }, - new ScheduledTask { Interval = 6 * 60, TypeName = typeof(ApplicationCheckUpdateCommand).FullName }, - new ScheduledTask { Interval = 6 * 60, TypeName = typeof(CheckHealthCommand).FullName }, - new ScheduledTask { Interval = 24 * 60, TypeName = typeof(RefreshMovieCommand).FullName }, - new ScheduledTask { Interval = 24 * 60, TypeName = typeof(HousekeepingCommand).FullName }, - new ScheduledTask { Interval = 24 * 60, TypeName = typeof(CleanUpRecycleBinCommand).FullName }, + new ScheduledTask + { + Interval = 5, + TypeName = typeof(MessagingCleanupCommand).FullName + }, + + new ScheduledTask + { + Interval = 6 * 60, + TypeName = typeof(ApplicationCheckUpdateCommand).FullName + }, + + new ScheduledTask + { + Interval = 6 * 60, + TypeName = typeof(CheckHealthCommand).FullName + }, + + new ScheduledTask + { + Interval = 24 * 60, + TypeName = typeof(RefreshMovieCommand).FullName + }, + + new ScheduledTask + { + Interval = 24 * 60, + TypeName = typeof(HousekeepingCommand).FullName + }, + + new ScheduledTask + { + Interval = 24 * 60, + TypeName = typeof(CleanUpRecycleBinCommand).FullName + }, new ScheduledTask { @@ -89,13 +122,14 @@ namespace NzbDrone.Core.Jobs new ScheduledTask { Interval = Math.Max(_configService.CheckForFinishedDownloadInterval, 1), - TypeName = typeof(RefreshMonitoredDownloadsCommand).FullName + TypeName = typeof(RefreshMonitoredDownloadsCommand).FullName, + Priority = CommandPriority.High } }; var currentTasks = _scheduledTaskRepository.All().ToList(); - _logger.Trace("Initializing jobs. Available: {0} Existing: {1}", defaultTasks.Length, currentTasks.Count); + _logger.Trace("Initializing jobs. Available: {0} Existing: {1}", defaultTasks.Count, currentTasks.Count); foreach (var job in currentTasks) { @@ -117,6 +151,9 @@ namespace NzbDrone.Core.Jobs currentDefinition.LastExecution = DateTime.UtcNow; } + currentDefinition.Priority = defaultTask.Priority; + + _cache.Set(currentDefinition.TypeName, currentDefinition); _scheduledTaskRepository.Upsert(currentDefinition); } } @@ -170,7 +207,11 @@ namespace NzbDrone.Core.Jobs if (scheduledTask != null && message.Command.Body.UpdateScheduledTask) { _logger.Trace("Updating last run time for: {0}", scheduledTask.TypeName); - _scheduledTaskRepository.SetLastExecutionTime(scheduledTask.Id, DateTime.UtcNow, message.Command.StartedAt.Value); + + var lastExecution = DateTime.UtcNow; + + _scheduledTaskRepository.SetLastExecutionTime(scheduledTask.Id, lastExecution, message.Command.StartedAt.Value); + _cache.Find(scheduledTask.TypeName).LastExecution = lastExecution; } } @@ -189,6 +230,10 @@ namespace NzbDrone.Core.Jobs refreshMonitoredDownloads.Interval = _configService.CheckForFinishedDownloadInterval; _scheduledTaskRepository.UpdateMany(new List { rss, importList, refreshMonitoredDownloads, backup }); + + _cache.Find(rss.TypeName).Interval = rss.Interval; + _cache.Find(importList.TypeName).Interval = importList.Interval; + _cache.Find(backup.TypeName).Interval = backup.Interval; } } } diff --git a/src/NzbDrone.Core/Messaging/Commands/CommandPriorityComparer.cs b/src/NzbDrone.Core/Messaging/Commands/CommandPriorityComparer.cs new file mode 100644 index 000000000..5d8d5f13e --- /dev/null +++ b/src/NzbDrone.Core/Messaging/Commands/CommandPriorityComparer.cs @@ -0,0 +1,32 @@ +using System.Collections.Generic; + +namespace NzbDrone.Core.Messaging.Commands +{ + public class CommandPriorityComparer : IComparer + { + public int Compare(CommandStatus x, CommandStatus y) + { + if (x == CommandStatus.Started && y != CommandStatus.Started) + { + return -1; + } + + if (x != CommandStatus.Started && y == CommandStatus.Started) + { + return 1; + } + + if (x < y) + { + return -1; + } + + if (x > y) + { + return 1; + } + + return 0; + } + } +} diff --git a/src/Radarr.Api.V3/Commands/CommandController.cs b/src/Radarr.Api.V3/Commands/CommandController.cs index 20a3b8e80..ff7a0b219 100644 --- a/src/Radarr.Api.V3/Commands/CommandController.cs +++ b/src/Radarr.Api.V3/Commands/CommandController.cs @@ -27,6 +27,8 @@ namespace Radarr.Api.V3.Commands private readonly Debouncer _debouncer; private readonly Dictionary _pendingUpdates; + private readonly CommandPriorityComparer _commandPriorityComparer = new CommandPriorityComparer(); + public CommandController(IManageCommandQueue commandQueueManager, IBroadcastSignalRMessage signalRBroadcaster, KnownTypes knownTypes) @@ -74,7 +76,10 @@ namespace Radarr.Api.V3.Commands [HttpGet] public List GetStartedCommands() { - return _commandQueueManager.All().ToResource(); + return _commandQueueManager.All() + .OrderBy(c => c.Status, _commandPriorityComparer) + .ThenByDescending(c => c.Priority) + .ToResource(); } [RestDeleteById]