Merge pull request #17709 from Shadowghost/fix-people-task-peristv12.0-rc6

Persist the refresh stamp so the people task stops redoing its work

1 files changed, 27 insertions, 32 deletions

diff --git a/Emby.Server.Implementations/ScheduledTasks/Tasks/PeopleValidationTask.cs b/Emby.Server.Implementations/ScheduledTasks/Tasks/PeopleValidationTask.cs
index bd73f63aa7..afb27ddf9e 100644
--- a/Emby.Server.Implementations/ScheduledTasks/Tasks/PeopleValidationTask.cs
+++ b/Emby.Server.Implementations/ScheduledTasks/Tasks/PeopleValidationTask.cs
@@ -177,56 +177,51 @@ public class PeopleValidationTask : IScheduledTask, IConfigurableScheduledTask
         var thirtyDaysAgo = DateTime.UtcNow.AddDays(-30);
         var personTypeName = _itemTypeLookup.BaseItemKindNames[BaseItemKind.Person];
 
+        List<Guid> peopleIds;
+
         var context = await _dbContextFactory.CreateDbContextAsync(cancellationToken).ConfigureAwait(false);
         await using (context.ConfigureAwait(false))
         {
-            const int PartitionSize = 100;
-
-            var numPeople = await context.BaseItems
+            // Read the candidates in one go rather than paging them. A refresh stamps the person and takes
+            // it out of this set, so a growing offset over a shrinking set walks past people it never visits.
+            peopleIds = await context.BaseItems
                 .AsNoTracking()
                 .Where(b => b.Type == personTypeName)
                 .Where(b => b.DateLastRefreshed == null || b.DateLastRefreshed < thirtyDaysAgo)
                 .Where(b =>
                     !b.Images!.Any(i => i.ImageType == ImageInfoImageType.Primary) ||
                     string.IsNullOrEmpty(b.Overview))
-                .CountAsync(cancellationToken)
+                .OrderBy(b => b.Id)
+                .Select(b => b.Id)
+                .ToListAsync(cancellationToken)
                 .ConfigureAwait(false);
+        }
 
-            _logger.LogDebug("Found {Count} people needing image/overview refresh", numPeople);
+        _logger.LogDebug("Found {Count} people needing image/overview refresh", peopleIds.Count);
 
-            if (numPeople == 0)
-            {
-                progress.Report(100);
-                return;
-            }
+        if (peopleIds.Count == 0)
+        {
+            progress.Report(100);
+            return;
+        }
 
-            var numComplete = 0;
-            var numRefreshed = 0;
+        var numComplete = 0;
+        var numRefreshed = 0;
 
-            await foreach (var entry in context.BaseItems
-                .AsNoTracking()
-                .Where(b => b.Type == personTypeName)
-                .Where(b => b.DateLastRefreshed == null || b.DateLastRefreshed < thirtyDaysAgo)
-                .Where(b =>
-                    !b.Images!.Any(i => i.ImageType == ImageInfoImageType.Primary) ||
-                    string.IsNullOrEmpty(b.Overview))
-                .OrderBy(b => b.Id)
-                .WithPartitionProgress(partition => _logger.LogDebug("Processing people partition {Partition}", partition))
-                .PartitionEagerAsync(PartitionSize, cancellationToken)
-                .WithCancellation(cancellationToken)
-                .ConfigureAwait(false))
-            {
-                if (await RefreshPersonAsync(entry.Id, cancellationToken).ConfigureAwait(false))
-                {
-                    numRefreshed++;
-                }
+        foreach (var personId in peopleIds)
+        {
+            cancellationToken.ThrowIfCancellationRequested();
 
-                numComplete++;
-                progress.Report(100.0 * numComplete / numPeople);
+            if (await RefreshPersonAsync(personId, cancellationToken).ConfigureAwait(false))
+            {
+                numRefreshed++;
             }
 
-            _logger.LogInformation("Refreshed metadata for {Count} people missing images or overview", numRefreshed);
+            numComplete++;
+            progress.Report(100.0 * numComplete / peopleIds.Count);
         }
+
+        _logger.LogInformation("Refreshed metadata for {Count} people missing images or overview", numRefreshed);
     }
 
     private async Task<bool> RefreshPersonAsync(Guid personId, CancellationToken cancellationToken)