alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-01-15 15:48:03 +00:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Backport pull request #15328 from jellyfin/release-10.11.z
Some checks failed
Stale PR Check / Check PRs with merge conflicts (push) Has been cancelled
Details
CodeQL / Analyze (csharp) (push) Has been cancelled
Details
OpenAPI / OpenAPI - HEAD (push) Has been cancelled
Details
OpenAPI / OpenAPI - BASE (push) Has been cancelled
Details
Tests / run-tests (macos-latest) (push) Has been cancelled
Details
Tests / run-tests (ubuntu-latest) (push) Has been cancelled
Details
Tests / run-tests (windows-latest) (push) Has been cancelled
Details
Project Automation / Project board (push) Has been cancelled
Details
Merge Conflict Labeler / Labeling (push) Has been cancelled
Details
OpenAPI / OpenAPI - Difference (push) Has been cancelled
Details
OpenAPI / OpenAPI - Publish Unstable Spec (push) Has been cancelled
Details
OpenAPI / OpenAPI - Publish Stable Spec (push) Has been cancelled
Details
Stale Issue Labeler / Check for stale issues (push) Has been cancelled
Details

Browse Source 
fix: in optimistic locking, key off table is locked

Original-merge: b5f0199a25

Merged-by: crobibero <cody@robibe.ro>

Backported-by: Joshua M. Boniface <joshua@boniface.me>
This commit is contained in:
evanreichard
2025-11-02 21:58:46 -05:00
committed by Joshua M. Boniface
parent 87b02b1316
commit a7d039b7c6
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Jellyfin.Database/Jellyfin.Database.Implementations/Locking/OptimisticLockBehavior.cs
View File

@@ -52,10 +52,14 @@ public class OptimisticLockBehavior : IEntityFrameworkCoreLockingBehavior
_logger = logger;
_writePolicy = Policy
.HandleInner<Exception>(e => e.Message.Contains("database is locked", StringComparison.InvariantCultureIgnoreCase))
.HandleInner<Exception>(e =>
e.Message.Contains("database is locked", StringComparison.InvariantCultureIgnoreCase) ||
e.Message.Contains("database table is locked", StringComparison.InvariantCultureIgnoreCase))
.WaitAndRetry(sleepDurations.Length, backoffProvider, RetryHandle);
_writeAsyncPolicy = Policy
.HandleInner<Exception>(e => e.Message.Contains("database is locked", StringComparison.InvariantCultureIgnoreCase))
.HandleInner<Exception>(e =>
e.Message.Contains("database is locked", StringComparison.InvariantCultureIgnoreCase) ||
e.Message.Contains("database table is locked", StringComparison.InvariantCultureIgnoreCase))
.WaitAndRetryAsync(sleepDurations.Length, backoffProvider, RetryHandle);
void RetryHandle(Exception exception, TimeSpan timespan, int retryNo, Context context)