Skip to content

Fixed scoping issue with multiple itterations on the foreach #20100

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fixed scoping issue with multiple itterations on the foreach #20100

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 14 additions & 16 deletions src/Umbraco.Core/Services/ContentVersionService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,32 +269,30 @@ private IReadOnlyCollection<ContentVersionMeta> CleanupDocumentVersions(DateTime

_logger.LogDebug("Removing {count} ContentVersion(s)", versionsToDelete.Count);

foreach (IEnumerable<ContentVersionMeta> group in versionsToDelete.InGroupsOf(Constants.Sql.MaxParameterCount))
{
using (ICoreScope scope = _scopeProvider.CreateCoreScope())
{
scope.WriteLock(Constants.Locks.ContentTree);
var groupEnumerated = group.ToList();
_documentVersionRepository.DeleteVersions(groupEnumerated.Select(x => x.VersionId));

foreach (ContentVersionMeta version in groupEnumerated)
foreach (IEnumerable<ContentVersionMeta> group in versionsToDelete.InGroupsOf(Constants.Sql.MaxParameterCount))
{
EventMessages messages = _eventMessagesFactory.Get();
var groupEnumerated = group.ToList();
_documentVersionRepository.DeleteVersions(groupEnumerated.Select(x => x.VersionId));

scope.Notifications.Publish(
new ContentDeletedVersionsNotification(version.ContentId, messages, version.VersionId));
}
foreach (ContentVersionMeta version in groupEnumerated)
{
EventMessages messages = _eventMessagesFactory.Get();

scope.Notifications.Publish(new ContentDeletedVersionsNotification(version.ContentId, messages, version.VersionId));
}
}
scope.Complete();
}
Comment on lines 272 to 288
Copy link
Preview

Copilot AI Sep 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The current implementation processes all version groups within a single scope, which could lead to very long-running transactions. For large datasets, this approach may cause database lock contention and timeout issues. Consider keeping the original per-batch scoping but fixing the lock acquisition issue differently, such as using a higher-level coordination mechanism.

Copilot uses AI. Check for mistakes.

}

using (ICoreScope scope = _scopeProvider.CreateCoreScope())
{
Audit(AuditType.Delete, Constants.Security.SuperUserId, -1, $"Removed {versionsToDelete.Count} ContentVersion(s) according to cleanup policy");
using (ICoreScope scope = _scopeProvider.CreateCoreScope())
{
Audit(AuditType.Delete, Constants.Security.SuperUserId, -1, $"Removed {versionsToDelete.Count} ContentVersion(s) according to cleanup policy");

scope.Complete();
}
scope.Complete();
}

return versionsToDelete;
}
Expand Down