Performance: Re-introduce lazy locks#21102
Conversation
…blishing Acquire a write lock on ContentTree at the start of PublishAsync to prevent deadlocks. Previously, inner scopes would acquire read locks first (via repository operations), then attempt to upgrade to write locks, causing deadlocks when multiple transactions tried this simultaneously. By acquiring the write lock at the outer scope, we ensure consistent lock ordering and prevent the deadlock scenario. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
c638d77 to
631b3db
Compare
There was a problem hiding this comment.
Pull request overview
This PR re-introduces lazy locking to improve performance by deferring database lock acquisition until data is actually accessed, rather than acquiring locks eagerly at the start of operations. This optimization reduces unnecessary database round-trips when data is served from repository caches, showing significant performance improvements in load testing (29% faster for cache-hit scenarios on SQL Server, 10-15% faster for write-heavy workloads).
Key Changes:
- Switched
ReadLockandWriteLockinLockingMechanismto use lazy implementations instead of eager ones - Added missing
WriteLocktoContentPublishingService.PublishAsyncfor thread safety consistency
Reviewed changes
Copilot reviewed 1 out of 1 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| src/Umbraco.Core/Scoping/LockingMechanism.cs | Changes ReadLock and WriteLock to use LazyReadLockInner and LazyWriteLockInner instead of EagerReadLockInner and EagerWriteLockInner, enabling deferred lock acquisition |
| src/Umbraco.Core/Services/ContentPublishingService.cs | Adds WriteLock call to PublishAsync method, ensuring consistent locking pattern with other content mutation operations |
The changes look good and follow established patterns in the codebase. The added lock in ContentPublishingService is consistent with similar operations in ContentService (e.g., Unpublish, PublishBranch), and the lazy lock implementation properly queues locks for later acquisition. No issues were found during review.
|
@AndyButland Adding you as reviewer as I know you have been working on some performance improvements, so hoping you might have a "real" data set that we can test the change against. |
|
I've done some tests using a setup with Umbraco running locally and connecting to a database in Azure - so very high latency between web application and database. Not a particularly real-world scenario for production, but it only exaggerates the concern so makes it easier to see improvements. I'm testing using a sample database and a document that contains seven published languages and multiple blocks. For each test, I've restarted the website, refreshed the backoffice content page and saved and published once before measuring. Using code from
Using code from this branch with lazy locks
Using code with read locks disabled
So overall:
This matches with previous analysis I did, finding the bulk of the time taken in the publish operation to be in From a one-off test here:
Given we are already using SQL bulk insert and update batch statements here, it's not obvious how we might further improve this part. Nonetheless, the update in this PR looks clearly a net benefit to re-introduce. |
AndyButland
left a comment
There was a problem hiding this comment.
Following team discussion we've decided to include this for 17.1. Testing has shown a clear performance improvement and we haven't been able to show any evidence for the deadlock concern that was raised as a reason for historically removing them in the past.
Updated [Umbraco.Cms.Persistence.Sqlite](https://github.com/umbraco/Umbraco-CMS) from 17.0.2 to 17.1.0. <details> <summary>Release notes</summary> _Sourced from [Umbraco.Cms.Persistence.Sqlite's releases](https://github.com/umbraco/Umbraco-CMS/releases)._ ## 17.1.0 # What's Changed Since 17.1.0-rc ### 🐛 Bug Fixes * Media: Fix files not deleted from disk when recycle bin protection is enabled by @AndyButland in umbraco/Umbraco-CMS#21309 * Document Editing: Refactor of Fix property variation change breaking document save via Infinite Editing (closes #21195) by @nielslyngsoe in umbraco/Umbraco-CMS#21293 * umbraco/Umbraco-CMS#21306 by @calm329 in umbraco/Umbraco-CMS#21306 **Full Changelog**: umbraco/Umbraco-CMS@release-17.1.0-rc...release-17.1.0 ## What's Changed Since the Last Release (17.0.2) ### 📦 Dependencies * Dependencies: Fixed dependency conflicts when installing Microsoft.EntityFrameworkCore.Design (closes #20421) by @lauraneto in umbraco/Umbraco-CMS#20474 * Dependencies: Remove `Microsoft.CodeAnalysis.CSharp` dependency from Umbraco.Infrastructure by @lauraneto in umbraco/Umbraco-CMS#20481 * build(deps): bumps @umbraco-ui/uui from 1.16.0-rc.0 to 1.16.0 by @iOvergaard in umbraco/Umbraco-CMS#20535 * Bump vite from 7.1.9 to 7.1.11 in /src/Umbraco.Web.UI.Client by @dependabot[bot] in umbraco/Umbraco-CMS#20580 * Bump vite from 7.1.9 to 7.1.11 in /src/Umbraco.Web.UI.Login by @dependabot[bot] in umbraco/Umbraco-CMS#20621 * Bump playwright and @playwright/test in /tests/Umbraco.Tests.AcceptanceTest by @dependabot[bot] in umbraco/Umbraco-CMS#20579 * Bump the npm_and_yarn group across 2 directories with 1 update by @dependabot[bot] in umbraco/Umbraco-CMS#20863 * Dependencies: Updates some dependencies to latest minor or patch releases by @AndyButland in umbraco/Umbraco-CMS#20953 * build(deps): bumps monaco-editor from 0.54.0 to 0.55.1 by @iOvergaard in umbraco/Umbraco-CMS#21054 ### 🌈 Accessibility Improvements * Entity Actions: Create button discernible text (fixes #20205) by @OskarKruger in umbraco/Umbraco-CMS#20434 * Entity Actions: More create button discernible text, extension of #20434 by @OskarKruger in umbraco/Umbraco-CMS#20458 * Header: Adjusted button focus border color contrast by @MrHutmat in umbraco/Umbraco-CMS#20562 * Login: Added custom validation for missing password and user/email on the login form by @MrHutmat in umbraco/Umbraco-CMS#20233 * Accessibility: Adding a label attribute for `<uui-button>` in news dashboard by @MrHutmat in umbraco/Umbraco-CMS#20780 * Keyboard navigation: Return to opening element after modal close by @MrHutmat in umbraco/Umbraco-CMS#20782 ### 🚀 New Features * Preview: Allows changing the preview environment inside the preview app, and other UX changes that enhance the experience by @leekelleher in umbraco/Umbraco-CMS#20598 * Login: Adds show/hide password toggle by @MrHutmat in umbraco/Umbraco-CMS#20611 * Adds Clear Clipboard button & logic by @warrenbuckley in umbraco/Umbraco-CMS#20757 * Member types: Implement containers by @ronaldbarendse in umbraco/Umbraco-CMS#20706 * Log viewer: Improves search functionality and code quality by @iOvergaard in umbraco/Umbraco-CMS#20913 * Log Viewer: Enhances the donut chart to be responsive, link to log search, and show numbers directly by @iOvergaard in umbraco/Umbraco-CMS#20928 * Culture and Hostnames: Add ability to sort hostnames (closes #20691) by @MrHutmat in umbraco/Umbraco-CMS#20826 * Localization: Adds `termOrDefault()` method to accept a fallback value by @iOvergaard in umbraco/Umbraco-CMS#20947 * Block Grid: Sort mode by @leekelleher in umbraco/Umbraco-CMS#20869 * News Dashboard: Adding functionality to overwrite the cache duration by @NillasKA in umbraco/Umbraco-CMS#21064 * Block List: Sort mode by @leekelleher in umbraco/Umbraco-CMS#21060 * Extend RTE output in Delivery API for better support for multi-site URL resolution by @MiguelGuedelha in umbraco/Umbraco-CMS#20846 * Content Types: Introduce schema service to support future schema generation by @lauraneto in umbraco/Umbraco-CMS#21031 * Delivery API: Adding allow list for content types by @NillasKA in umbraco/Umbraco-CMS#21111 * Emails: Add `Expires` header by @rickbutterfield in umbraco/Umbraco-CMS#20285 * Indexing: Make the indexing batch size configurable by @kjac in umbraco/Umbraco-CMS#20543 * Media: Add protection to restrict access to media in recycle bin (closes #2931) by @AndyButland in umbraco/Umbraco-CMS#20378 * Collection: Introduce Collection Item Card extension type by @madsrasmussen in umbraco/Umbraco-CMS#20954 * Collection: Introduce Collection Item Ref extension type by @madsrasmussen in umbraco/Umbraco-CMS#20994 ... (truncated) ## 17.1.0-rc ## What's Changed ### 📦 Dependencies * Dependencies: Fixed dependency conflicts when installing Microsoft.EntityFrameworkCore.Design (closes #20421) by @lauraneto in umbraco/Umbraco-CMS#20474 * Dependencies: Remove `Microsoft.CodeAnalysis.CSharp` dependency from Umbraco.Infrastructure by @lauraneto in umbraco/Umbraco-CMS#20481 * build(deps): bumps @umbraco-ui/uui from 1.16.0-rc.0 to 1.16.0 by @iOvergaard in umbraco/Umbraco-CMS#20535 * Bump vite from 7.1.9 to 7.1.11 in /src/Umbraco.Web.UI.Client by @dependabot[bot] in umbraco/Umbraco-CMS#20580 * Bump vite from 7.1.9 to 7.1.11 in /src/Umbraco.Web.UI.Login by @dependabot[bot] in umbraco/Umbraco-CMS#20621 * Bump playwright and @playwright/test in /tests/Umbraco.Tests.AcceptanceTest by @dependabot[bot] in umbraco/Umbraco-CMS#20579 * Bump the npm_and_yarn group across 2 directories with 1 update by @dependabot[bot] in umbraco/Umbraco-CMS#20863 * Dependencies: Updates some dependencies to latest minor or patch releases by @AndyButland in umbraco/Umbraco-CMS#20953 * build(deps): bumps monaco-editor from 0.54.0 to 0.55.1 by @iOvergaard in umbraco/Umbraco-CMS#21054 ### 🌈 Accessibility Improvements * Entity Actions: Create button discernible text (fixes #20205) by @OskarKruger in umbraco/Umbraco-CMS#20434 * Entity Actions: More create button discernible text, extension of #20434 by @OskarKruger in umbraco/Umbraco-CMS#20458 * Header: Adjusted button focus border color contrast by @MrHutmat in umbraco/Umbraco-CMS#20562 * Login: Added custom validation for missing password and user/email on the login form by @MrHutmat in umbraco/Umbraco-CMS#20233 * Accessibility: Adding a label attribute for `<uui-button>` in news dashboard by @MrHutmat in umbraco/Umbraco-CMS#20780 * Keyboard navigation: Return to opening element after modal close by @MrHutmat in umbraco/Umbraco-CMS#20782 ### 🚀 New Features * Preview: Allows changing the preview environment inside the preview app, and other UX changes that enhance the experience by @leekelleher in umbraco/Umbraco-CMS#20598 * Login: Adds show/hide password toggle by @MrHutmat in umbraco/Umbraco-CMS#20611 * Adds Clear Clipboard button & logic by @warrenbuckley in umbraco/Umbraco-CMS#20757 * Member types: Implement containers by @ronaldbarendse in umbraco/Umbraco-CMS#20706 * Log viewer: Improves search functionality and code quality by @iOvergaard in umbraco/Umbraco-CMS#20913 * Log Viewer: Enhances the donut chart to be responsive, link to log search, and show numbers directly by @iOvergaard in umbraco/Umbraco-CMS#20928 * Culture and Hostnames: Add ability to sort hostnames (closes #20691) by @MrHutmat in umbraco/Umbraco-CMS#20826 * Localization: Adds `termOrDefault()` method to accept a fallback value by @iOvergaard in umbraco/Umbraco-CMS#20947 * Block Grid: Sort mode by @leekelleher in umbraco/Umbraco-CMS#20869 * News Dashboard: Adding functionality to overwrite the cache duration by @NillasKA in umbraco/Umbraco-CMS#21064 * Block List: Sort mode by @leekelleher in umbraco/Umbraco-CMS#21060 * Extend RTE output in Delivery API for better support for multi-site URL resolution by @MiguelGuedelha in umbraco/Umbraco-CMS#20846 * Content Types: Introduce schema service to support future schema generation by @lauraneto in umbraco/Umbraco-CMS#21031 * Delivery API: Adding allow list for content types by @NillasKA in umbraco/Umbraco-CMS#21111 * Emails: Add `Expires` header by @rickbutterfield in umbraco/Umbraco-CMS#20285 * Indexing: Make the indexing batch size configurable by @kjac in umbraco/Umbraco-CMS#20543 * Media: Add protection to restrict access to media in recycle bin (closes #2931) by @AndyButland in umbraco/Umbraco-CMS#20378 * Collection: Introduce Collection Item Card extension type by @madsrasmussen in umbraco/Umbraco-CMS#20954 * Collection: Introduce Collection Item Ref extension type by @madsrasmussen in umbraco/Umbraco-CMS#20994 * Collection: Introduce Card and Ref Collection View kinds by @madsrasmussen in umbraco/Umbraco-CMS#21037 ### 🚤 Performance * Performance: Optimize memory footprint of document URL cache (closes #21055) by @AndyButland in umbraco/Umbraco-CMS#21066 * Distributed Background Jobs: Improve distributed background job locking behavior and performance by @nikolajlauridsen in umbraco/Umbraco-CMS#21100 * Repositories: Optimize repository caches to populate for both int and GUID keys by @AndyButland in umbraco/Umbraco-CMS#21124 * Performance: Re-introduce lazy locks by @lauraneto in umbraco/Umbraco-CMS#21102 ### 🐛 Bug Fixes ... (truncated) Commits viewable in [compare view](umbraco/Umbraco-CMS@release-17.0.2...release-17.1.0). </details> [](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Updated [Umbraco.Cms.DevelopmentMode.Backoffice](https://github.com/umbraco/Umbraco-CMS) from 17.0.2 to 17.1.0. <details> <summary>Release notes</summary> _Sourced from [Umbraco.Cms.DevelopmentMode.Backoffice's releases](https://github.com/umbraco/Umbraco-CMS/releases)._ ## 17.1.0 # What's Changed Since 17.1.0-rc ### 🐛 Bug Fixes * Media: Fix files not deleted from disk when recycle bin protection is enabled by @AndyButland in umbraco/Umbraco-CMS#21309 * Document Editing: Refactor of Fix property variation change breaking document save via Infinite Editing (closes #21195) by @nielslyngsoe in umbraco/Umbraco-CMS#21293 * umbraco/Umbraco-CMS#21306 by @calm329 in umbraco/Umbraco-CMS#21306 **Full Changelog**: umbraco/Umbraco-CMS@release-17.1.0-rc...release-17.1.0 ## What's Changed Since the Last Release (17.0.2) ### 📦 Dependencies * Dependencies: Fixed dependency conflicts when installing Microsoft.EntityFrameworkCore.Design (closes #20421) by @lauraneto in umbraco/Umbraco-CMS#20474 * Dependencies: Remove `Microsoft.CodeAnalysis.CSharp` dependency from Umbraco.Infrastructure by @lauraneto in umbraco/Umbraco-CMS#20481 * build(deps): bumps @umbraco-ui/uui from 1.16.0-rc.0 to 1.16.0 by @iOvergaard in umbraco/Umbraco-CMS#20535 * Bump vite from 7.1.9 to 7.1.11 in /src/Umbraco.Web.UI.Client by @dependabot[bot] in umbraco/Umbraco-CMS#20580 * Bump vite from 7.1.9 to 7.1.11 in /src/Umbraco.Web.UI.Login by @dependabot[bot] in umbraco/Umbraco-CMS#20621 * Bump playwright and @playwright/test in /tests/Umbraco.Tests.AcceptanceTest by @dependabot[bot] in umbraco/Umbraco-CMS#20579 * Bump the npm_and_yarn group across 2 directories with 1 update by @dependabot[bot] in umbraco/Umbraco-CMS#20863 * Dependencies: Updates some dependencies to latest minor or patch releases by @AndyButland in umbraco/Umbraco-CMS#20953 * build(deps): bumps monaco-editor from 0.54.0 to 0.55.1 by @iOvergaard in umbraco/Umbraco-CMS#21054 ### 🌈 Accessibility Improvements * Entity Actions: Create button discernible text (fixes #20205) by @OskarKruger in umbraco/Umbraco-CMS#20434 * Entity Actions: More create button discernible text, extension of #20434 by @OskarKruger in umbraco/Umbraco-CMS#20458 * Header: Adjusted button focus border color contrast by @MrHutmat in umbraco/Umbraco-CMS#20562 * Login: Added custom validation for missing password and user/email on the login form by @MrHutmat in umbraco/Umbraco-CMS#20233 * Accessibility: Adding a label attribute for `<uui-button>` in news dashboard by @MrHutmat in umbraco/Umbraco-CMS#20780 * Keyboard navigation: Return to opening element after modal close by @MrHutmat in umbraco/Umbraco-CMS#20782 ### 🚀 New Features * Preview: Allows changing the preview environment inside the preview app, and other UX changes that enhance the experience by @leekelleher in umbraco/Umbraco-CMS#20598 * Login: Adds show/hide password toggle by @MrHutmat in umbraco/Umbraco-CMS#20611 * Adds Clear Clipboard button & logic by @warrenbuckley in umbraco/Umbraco-CMS#20757 * Member types: Implement containers by @ronaldbarendse in umbraco/Umbraco-CMS#20706 * Log viewer: Improves search functionality and code quality by @iOvergaard in umbraco/Umbraco-CMS#20913 * Log Viewer: Enhances the donut chart to be responsive, link to log search, and show numbers directly by @iOvergaard in umbraco/Umbraco-CMS#20928 * Culture and Hostnames: Add ability to sort hostnames (closes #20691) by @MrHutmat in umbraco/Umbraco-CMS#20826 * Localization: Adds `termOrDefault()` method to accept a fallback value by @iOvergaard in umbraco/Umbraco-CMS#20947 * Block Grid: Sort mode by @leekelleher in umbraco/Umbraco-CMS#20869 * News Dashboard: Adding functionality to overwrite the cache duration by @NillasKA in umbraco/Umbraco-CMS#21064 * Block List: Sort mode by @leekelleher in umbraco/Umbraco-CMS#21060 * Extend RTE output in Delivery API for better support for multi-site URL resolution by @MiguelGuedelha in umbraco/Umbraco-CMS#20846 * Content Types: Introduce schema service to support future schema generation by @lauraneto in umbraco/Umbraco-CMS#21031 * Delivery API: Adding allow list for content types by @NillasKA in umbraco/Umbraco-CMS#21111 * Emails: Add `Expires` header by @rickbutterfield in umbraco/Umbraco-CMS#20285 * Indexing: Make the indexing batch size configurable by @kjac in umbraco/Umbraco-CMS#20543 * Media: Add protection to restrict access to media in recycle bin (closes #2931) by @AndyButland in umbraco/Umbraco-CMS#20378 * Collection: Introduce Collection Item Card extension type by @madsrasmussen in umbraco/Umbraco-CMS#20954 * Collection: Introduce Collection Item Ref extension type by @madsrasmussen in umbraco/Umbraco-CMS#20994 ... (truncated) ## 17.1.0-rc ## What's Changed ### 📦 Dependencies * Dependencies: Fixed dependency conflicts when installing Microsoft.EntityFrameworkCore.Design (closes #20421) by @lauraneto in umbraco/Umbraco-CMS#20474 * Dependencies: Remove `Microsoft.CodeAnalysis.CSharp` dependency from Umbraco.Infrastructure by @lauraneto in umbraco/Umbraco-CMS#20481 * build(deps): bumps @umbraco-ui/uui from 1.16.0-rc.0 to 1.16.0 by @iOvergaard in umbraco/Umbraco-CMS#20535 * Bump vite from 7.1.9 to 7.1.11 in /src/Umbraco.Web.UI.Client by @dependabot[bot] in umbraco/Umbraco-CMS#20580 * Bump vite from 7.1.9 to 7.1.11 in /src/Umbraco.Web.UI.Login by @dependabot[bot] in umbraco/Umbraco-CMS#20621 * Bump playwright and @playwright/test in /tests/Umbraco.Tests.AcceptanceTest by @dependabot[bot] in umbraco/Umbraco-CMS#20579 * Bump the npm_and_yarn group across 2 directories with 1 update by @dependabot[bot] in umbraco/Umbraco-CMS#20863 * Dependencies: Updates some dependencies to latest minor or patch releases by @AndyButland in umbraco/Umbraco-CMS#20953 * build(deps): bumps monaco-editor from 0.54.0 to 0.55.1 by @iOvergaard in umbraco/Umbraco-CMS#21054 ### 🌈 Accessibility Improvements * Entity Actions: Create button discernible text (fixes #20205) by @OskarKruger in umbraco/Umbraco-CMS#20434 * Entity Actions: More create button discernible text, extension of #20434 by @OskarKruger in umbraco/Umbraco-CMS#20458 * Header: Adjusted button focus border color contrast by @MrHutmat in umbraco/Umbraco-CMS#20562 * Login: Added custom validation for missing password and user/email on the login form by @MrHutmat in umbraco/Umbraco-CMS#20233 * Accessibility: Adding a label attribute for `<uui-button>` in news dashboard by @MrHutmat in umbraco/Umbraco-CMS#20780 * Keyboard navigation: Return to opening element after modal close by @MrHutmat in umbraco/Umbraco-CMS#20782 ### 🚀 New Features * Preview: Allows changing the preview environment inside the preview app, and other UX changes that enhance the experience by @leekelleher in umbraco/Umbraco-CMS#20598 * Login: Adds show/hide password toggle by @MrHutmat in umbraco/Umbraco-CMS#20611 * Adds Clear Clipboard button & logic by @warrenbuckley in umbraco/Umbraco-CMS#20757 * Member types: Implement containers by @ronaldbarendse in umbraco/Umbraco-CMS#20706 * Log viewer: Improves search functionality and code quality by @iOvergaard in umbraco/Umbraco-CMS#20913 * Log Viewer: Enhances the donut chart to be responsive, link to log search, and show numbers directly by @iOvergaard in umbraco/Umbraco-CMS#20928 * Culture and Hostnames: Add ability to sort hostnames (closes #20691) by @MrHutmat in umbraco/Umbraco-CMS#20826 * Localization: Adds `termOrDefault()` method to accept a fallback value by @iOvergaard in umbraco/Umbraco-CMS#20947 * Block Grid: Sort mode by @leekelleher in umbraco/Umbraco-CMS#20869 * News Dashboard: Adding functionality to overwrite the cache duration by @NillasKA in umbraco/Umbraco-CMS#21064 * Block List: Sort mode by @leekelleher in umbraco/Umbraco-CMS#21060 * Extend RTE output in Delivery API for better support for multi-site URL resolution by @MiguelGuedelha in umbraco/Umbraco-CMS#20846 * Content Types: Introduce schema service to support future schema generation by @lauraneto in umbraco/Umbraco-CMS#21031 * Delivery API: Adding allow list for content types by @NillasKA in umbraco/Umbraco-CMS#21111 * Emails: Add `Expires` header by @rickbutterfield in umbraco/Umbraco-CMS#20285 * Indexing: Make the indexing batch size configurable by @kjac in umbraco/Umbraco-CMS#20543 * Media: Add protection to restrict access to media in recycle bin (closes #2931) by @AndyButland in umbraco/Umbraco-CMS#20378 * Collection: Introduce Collection Item Card extension type by @madsrasmussen in umbraco/Umbraco-CMS#20954 * Collection: Introduce Collection Item Ref extension type by @madsrasmussen in umbraco/Umbraco-CMS#20994 * Collection: Introduce Card and Ref Collection View kinds by @madsrasmussen in umbraco/Umbraco-CMS#21037 ### 🚤 Performance * Performance: Optimize memory footprint of document URL cache (closes #21055) by @AndyButland in umbraco/Umbraco-CMS#21066 * Distributed Background Jobs: Improve distributed background job locking behavior and performance by @nikolajlauridsen in umbraco/Umbraco-CMS#21100 * Repositories: Optimize repository caches to populate for both int and GUID keys by @AndyButland in umbraco/Umbraco-CMS#21124 * Performance: Re-introduce lazy locks by @lauraneto in umbraco/Umbraco-CMS#21102 ### 🐛 Bug Fixes ... (truncated) Commits viewable in [compare view](umbraco/Umbraco-CMS@release-17.0.2...release-17.1.0). </details> [](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Alexander Seeliger <alexsee@users.noreply.github.com>
Summary
LockingMechanismby switchingReadLockandWriteLockto use their lazy implementations instead of eager onesBackground
The codebase already had the concept of lazy vs eager locks, but locks were always being acquired eagerly. This caused unnecessary database queries even when the actual data was already cached at the repository level.
The typical pattern:
Even if the media is cached, the eager lock still hits the database. With lazy locks, the lock is only acquired if and when the database is actually accessed.
Benefits
Load Test Results
All tests performed after rebasing on PR #21105 (deadlock fix). Each configuration was tested 5 times to ensure consistency.
Test 1: Cache-Hit Stress Test (50 VUs, 1000 iterations, 100% reads)
Tests performance when serving cached data - the ideal scenario for lazy locks to shine.
SQL Server Detail:
Test 2: Write-Heavy Stress Test (50 VUs, 200 iterations, mixed workload)
Tests high-concurrency write operations (create content type → GET → create content → GET → publish).
SQL Server Detail:
SQLite Detail:
Key Findings
SQL Server sees consistent improvement - Both read-heavy (29% faster) and write-heavy (10% faster) scenarios benefit from lazy locks under high concurrency.
Performance gap increases under load - Higher VU counts (50 vs 20) showed more pronounced benefits from lazy locks.
SQLite benefits from writes, not reads - SQLite's single-writer lock model means cache-hit scenarios don't benefit as much, but write-heavy workloads still see 15% improvement.
Both configurations are stable - No deadlocks observed with either approach after the PR Content Publishing: Fix deadlocks by acquiring WriteLock at outer scope #21105 fix.
Test plan